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

chrome/test/webdriver/automation.h

 // 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.
 
 #ifndef CHROME_TEST_WEBDRIVER_AUTOMATION_H_
 #define CHROME_TEST_WEBDRIVER_AUTOMATION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 // Creates and controls the Chrome instance.
 // This class should be created and accessed on a single thread.
 // Note: All member functions are void because they are invoked
 // by posting a task from NewRunnableMethod.
 class Automation {
  public:
   struct BrowserOptions {
     BrowserOptions();
     ~BrowserOptions();
 
-    CommandLine command;
+    CommandLine cmdline;
     FilePath user_data_dir;
     std::string channel_id;
   };
 
   Automation();
   virtual ~Automation();
 
   // Start the system's default Chrome binary.
   void Init(const BrowserOptions& options, Error** error);
 
@@ skipping 110 matching lines @@
   scoped_ptr<ProxyLauncher> launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Automation);
 };
 
 }  // namespace webdriver
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation);
 
 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_