Revert 96556 - Let pyauto create an attached webdriver instance to manipulate web pages.

chrome/test/webdriver/commands/create_session.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 "chrome/test/webdriver/commands/create_session.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/base64.h"
@@ skipping 55 matching lines @@
 bool CreateSession::DoesPost() { return true; }
 
 void CreateSession::ExecutePost(Response* const response) {
   DictionaryValue *capabilities = NULL;
   if (!GetDictionaryParameter("desiredCapabilities", &capabilities)) {
     response->SetError(new Error(
         kBadRequest, "Missing or invalid 'desiredCapabilities'"));
     return;
   }
 
-  Automation::BrowserOptions browser_options;
-  FilePath::StringType path;
-  if (capabilities->GetStringWithoutPathExpansion("chrome.binary", &path))
-    browser_options.cmdline = CommandLine(FilePath(path));
-
+  CommandLine command_line_options(CommandLine::NO_PROGRAM);
   ListValue* switches = NULL;
   const char* kCustomSwitchesKey = "chrome.switches";
   if (capabilities->GetListWithoutPathExpansion(kCustomSwitchesKey,
                                                 &switches)) {
     for (size_t i = 0; i < switches->GetSize(); ++i) {
       std::string switch_string;
       if (!switches->GetString(i, &switch_string)) {
         response->SetError(new Error(
             kBadRequest, "Custom switch is not a string"));
         return;
       }
       size_t separator_index = switch_string.find("=");
       if (separator_index != std::string::npos) {
         CommandLine::StringType switch_string_native;
         if (!switches->GetString(i, &switch_string_native)) {
           response->SetError(new Error(
               kBadRequest, "Custom switch is not a string"));
           return;
         }
-        browser_options.cmdline.AppendSwitchNative(
+        command_line_options.AppendSwitchNative(
             switch_string.substr(0, separator_index),
             switch_string_native.substr(separator_index + 1));
       } else {
-        browser_options.cmdline.AppendSwitch(switch_string);
+        command_line_options.AppendSwitch(switch_string);
       }
     }
   } else if (capabilities->HasKey(kCustomSwitchesKey)) {
     response->SetError(new Error(
         kBadRequest, "Custom switches must be a list"));
     return;
   }
-
   Value* verbose_value;
   if (capabilities->GetWithoutPathExpansion("chrome.verbose", &verbose_value)) {
-    bool verbose = false;
-    if (verbose_value->GetAsBoolean(&verbose)) {
+    bool verbose;
+    if (verbose_value->GetAsBoolean(&verbose) && verbose) {
       // Since logging is shared among sessions, if any session requests verbose
       // logging, verbose logging will be enabled for all sessions. It is not
       // possible to turn it off.
-      if (verbose)
-        logging::SetMinLogLevel(logging::LOG_INFO);
+      logging::SetMinLogLevel(logging::LOG_INFO);
     } else {
       response->SetError(new Error(
           kBadRequest, "verbose must be a boolean true or false"));
       return;
     }
   }
 
-  capabilities->GetStringWithoutPathExpansion(
-      "chrome.channel", &browser_options.channel_id);
+  FilePath browser_exe;
+  FilePath::StringType path;
+  if (capabilities->GetStringWithoutPathExpansion("chrome.binary", &path))
+    browser_exe = FilePath(path);
 
   ScopedTempDir temp_profile_dir;
   FilePath temp_user_data_dir;
 
   std::string base64_profile;
   if (capabilities->GetStringWithoutPathExpansion("chrome.profile",
                                                   &base64_profile)) {
     if (!temp_profile_dir.CreateUniqueTempDir()) {
       response->SetError(new Error(
           kBadRequest, "Could not create temporary profile directory."));
@@ skipping 42 matching lines @@
         return;
       }
       extensions.push_back(extension_file);
     }
   } else if (capabilities->HasKey(kExtensions)) {
     response->SetError(new Error(
         kBadRequest, "Extensions must be a list of base64 encoded strings"));
     return;
   }
 
-  Session::Options session_options;
+  Session::Options options;
   Error* error = NULL;
   error = GetBooleanCapability(capabilities, "chrome.nativeEvents",
-                               &session_options.use_native_events);
+                               &options.use_native_events);
   if (!error) {
     error = GetBooleanCapability(capabilities, "chrome.loadAsync",
-                                 &session_options.load_async);
+                                 &options.load_async);
   }
   if (error) {
     response->SetError(error);
     return;
   }
 
   // Session manages its own liftime, so do not call delete.
-  Session* session = new Session(session_options);
-  error = session->Init(browser_options);
+  Session* session = new Session(options);
+  error = session->Init(browser_exe,
+                        temp_user_data_dir,
+                        command_line_options);
   if (error) {
     response->SetError(error);
     return;
   }
 
   // Install extensions.
   for (size_t i = 0; i < extensions.size(); ++i) {
     Error* error = session->InstallExtension(extensions[i]);
     if (error) {
       response->SetError(error);
       return;
     }
   }
 
   LOG(INFO) << "Created session " << session->id();
   // Redirect to a relative URI. Although prohibited by the HTTP standard,
   // this is what the IEDriver does. Finding the actual IP address is
   // difficult, and returning the hostname causes perf problems with the python
   // bindings on Windows.
   std::ostringstream stream;
   stream << SessionManager::GetInstance()->url_base() << "/session/"
          << session->id();
   response->SetStatus(kSeeOther);
   response->SetValue(Value::CreateStringValue(stream.str()));
 }
 
 }  // namespace webdriver