Fix ChromeDriver flakiness with the C# webdriver bindings.

chrome/test/webdriver/webdriver_server.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <signal.h>
 #include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 41 matching lines @@
 #include "chrome/test/webdriver/commands/set_timeout_commands.h"
 #include "chrome/test/webdriver/commands/source_command.h"
 #include "chrome/test/webdriver/commands/target_locator_commands.h"
 #include "chrome/test/webdriver/commands/title_command.h"
 #include "chrome/test/webdriver/commands/url_command.h"
 #include "chrome/test/webdriver/commands/webelement_commands.h"
 #include "chrome/test/webdriver/commands/window_commands.h"
 #include "chrome/test/webdriver/webdriver_dispatch.h"
 #include "chrome/test/webdriver/webdriver_logging.h"
 #include "chrome/test/webdriver/webdriver_session_manager.h"
+#include "chrome/test/webdriver/webdriver_switches.h"
 #include "chrome/test/webdriver/webdriver_util.h"
 #include "third_party/mongoose/mongoose.h"
 
 #if defined(OS_WIN)
 #include <time.h>
 #elif defined(OS_POSIX)
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ skipping 180 matching lines @@
     root = cmd_line->GetSwitchValueASCII("root");
   if (cmd_line->HasSwitch("url-base"))
     url_base = cmd_line->GetSwitchValueASCII("url-base");
   if (cmd_line->HasSwitch("http-threads")) {
     if (!base::StringToInt(cmd_line->GetSwitchValueASCII("http-threads"),
                            &http_threads)) {
       std::cerr << "'http-threads' option must be an integer";
       return 1;
     }
   }
-  if (cmd_line->HasSwitch("enable-keep-alive"))
+  if (cmd_line->HasSwitch(kEnableKeepAlive))
     enable_keep_alive = true;
 
   bool logging_success = InitWebDriverLogging(log_path, kAllLogLevel);
   std::string chromedriver_info = base::StringPrintf(
       "ChromeDriver %s", chrome::kChromeVersion);
   FilePath chromedriver_exe;
   if (PathService::Get(base::FILE_EXE, &chromedriver_exe)) {
     chromedriver_info += base::StringPrintf(
         " %" PRFilePath, chromedriver_exe.value().c_str());
   }
@@ skipping 49 matching lines @@
 
   return (EXIT_SUCCESS);
 }
 
 }  // namespace webdriver
 
 int main(int argc, char *argv[]) {
   CommandLine::Init(argc, argv);
   return webdriver::RunChromeDriver();
 }