Revert 96562 - Disable pyauto tests on mac that requires py2.6. Fix 2 failing chromedriver

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 58 matching lines @@
   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.command = CommandLine(FilePath(path));
+    browser_options.cmdline = CommandLine(FilePath(path));
 
   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.command.AppendSwitchNative(
+        browser_options.cmdline.AppendSwitchNative(
             switch_string.substr(0, separator_index),
             switch_string_native.substr(separator_index + 1));
       } else {
-        browser_options.command.AppendSwitch(switch_string);
+        browser_options.cmdline.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)) {
       // 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);
     } else {
       response->SetError(new Error(
           kBadRequest, "verbose must be a boolean true or false"));
       return;
     }
   }
 
   capabilities->GetStringWithoutPathExpansion(
       "chrome.channel", &browser_options.channel_id);
 
   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."));
       return;
     }
     FilePath temp_profile_zip(
         temp_profile_dir.path().AppendASCII("profile.zip"));
     std::string message;
     if (!WriteBase64DataToFile(temp_profile_zip, base64_profile, &message)) {
       response->SetError(new Error(kBadRequest, message));
       return;
     }
 
-    browser_options.user_data_dir =
-        temp_profile_dir.path().AppendASCII("user_data_dir");
-    if (!Unzip(temp_profile_zip, browser_options.user_data_dir)) {
+    temp_user_data_dir = temp_profile_dir.path().AppendASCII("user_data_dir");
+    if (!Unzip(temp_profile_zip, temp_user_data_dir)) {
       response->SetError(new Error(
           kBadRequest, "Could not unarchive provided user profile"));
       return;
     }
   }
 
   const char* kExtensions = "chrome.extensions";
   ScopedTempDir extensions_dir;
   ListValue* extensions_list = NULL;
   std::vector<FilePath> extensions;
@@ skipping 63 matching lines @@
   // 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