Fix minor issues in ChromeDriver.

chrome/test/webdriver/server.cc

 // Copyright (c) 2011 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 213 matching lines @@
 
   // Register Chrome's path provider so that the AutomationProxy will find our
   // built Chrome.
   chrome::RegisterPathProvider();
   TestTimeouts::Initialize();
   InitChromeDriverLogging(*cmd_line);
 
   // Parse command line flags.
   std::string port = "9515";
   std::string root;
-  FilePath chrome_dir;
   std::string url_base;
   if (cmd_line->HasSwitch("port"))
     port = cmd_line->GetSwitchValueASCII("port");
   // The 'root' flag allows the user to specify a location to serve files from.
   // If it is not given, a callback will be registered to forbid all file
   // requests.
   if (cmd_line->HasSwitch("root"))
     root = cmd_line->GetSwitchValueASCII("root");
-  if (cmd_line->HasSwitch("chrome-dir"))
-    chrome_dir = cmd_line->GetSwitchValuePath("chrome-dir");
   if (cmd_line->HasSwitch("url-base"))
     url_base = cmd_line->GetSwitchValueASCII("url-base");
 
   webdriver::SessionManager* manager = webdriver::SessionManager::GetInstance();
   manager->set_port(port);
   manager->set_url_base(url_base);
-  if (!chrome_dir.empty()) {
-    if (!file_util::DirectoryExists(chrome_dir)) {
-      std::cout << "Given Chrome directory is inaccessible or does not exist: "
-                << chrome_dir.value() << std::endl;
-#if defined(OS_WIN)
-      return ERROR_PATH_NOT_FOUND;
-#else
-      return ENOENT;
-#endif
-    }
-    manager->set_chrome_dir(chrome_dir);
-  }
 
   // Initialize SHTTPD context.
   // Listen on port 9515 or port specified on command line.
   // TODO(jmikhail) Maybe add port 9516 as a secure connection.
   ctx = mg_start();
   if (!SetMongooseOptions(ctx, port, root)) {
     mg_stop(ctx);
 #if defined(OS_WIN)
     return WSAEADDRINUSE;
 #else
     return EADDRINUSE;
 #endif
   }
 
   webdriver::Dispatcher dispatcher(ctx, url_base);
   webdriver::InitCallbacks(ctx, &dispatcher, &shutdown_event, root.empty());
 
   // The tests depend on parsing the first line ChromeDriver outputs,
   // so all other logging should happen after this.
   std::cout << "Started ChromeDriver" << std::endl
             << "port=" << port << std::endl;
 
   if (root.length()) {
     VLOG(1) << "Serving files from the current working directory";
   }
-  if (!chrome_dir.empty()) {
-    VLOG(1) << "Using Chrome inside directory: " << chrome_dir.value();
-  }
 
   // Run until we receive command to shutdown.
   shutdown_event.Wait();
 
   // We should not reach here since the service should never quit.
   // TODO(jmikhail): register a listener for SIGTERM and break the
   // message loop gracefully.
   mg_stop(ctx);
   return (EXIT_SUCCESS);
 }