Added --config option support for Windows

Author: Mykola Tryshnivskyy

src/chrome/test/webdriver/webdriver_server.cc

@@ -466,17 +466,15 @@ int RunChromeDriver() {
   return (EXIT_SUCCESS);
 }
 
-#if !defined(OS_WIN)
 bool parse_config_to_cmd_line()
 {
     CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+    
     if (cmd_line->HasSwitch("config"))
     {
         //parse json config file and set value
         std::string config_json;
-        std::string configPathString = cmd_line->GetSwitchValueASCII("config");
-
-        FilePath configPath(configPathString);
+        FilePath configPath(cmd_line->GetSwitchValueNative("config"));
 
         if (file_util::ReadFileToString(configPath, &config_json))
         {
@@ -511,26 +509,22 @@ bool parse_config_to_cmd_line()
                 cmd_line->AppendSwitchASCII("http-threads", base::IntToString(http_threads));
             if (result_dict->GetString("log-path", &log_path))
                 cmd_line->AppendSwitchASCII("log-path", log_path);
-
-            return true;
-
         }
         else
         {
             std::cerr << "can't read file" << std::endl;
             return false;
         }
     }
+
+    return true;
 }
-#endif //!defined(OS_WIN)
 }  // namespace webdriver
 
 int main_server(int argc, char *argv[]) {
   CommandLine::Init(argc, argv);
 
-#if !defined(OS_WIN)
   webdriver::parse_config_to_cmd_line();
-#endif
 
   return webdriver::RunChromeDriver();
 }

src/third_party/mongoose/mongoose.c

@@ -58,7 +58,7 @@
   #endif
 #define _WIN32_WINNT 0x0400 // To make it link in VS2005
 #include <windows.h>
-#include <winsock2.h>
+//#include <winsock2.h>
 
 #ifndef PATH_MAX
 #define PATH_MAX MAX_PATH