Proxy settings automation hooks and related proxy settings fixes.

chrome/browser/automation/testing_automation_provider.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/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 2069 matching lines @@
 
   handler_map["LockScreen"] = &TestingAutomationProvider::LockScreen;
   handler_map["UnlockScreen"] = &TestingAutomationProvider::UnlockScreen;
   handler_map["SignoutInScreenLocker"] =
       &TestingAutomationProvider::SignoutInScreenLocker;
 
   handler_map["GetBatteryInfo"] = &TestingAutomationProvider::GetBatteryInfo;
 
   handler_map["GetNetworkInfo"] = &TestingAutomationProvider::GetNetworkInfo;
   handler_map["NetworkScan"] = &TestingAutomationProvider::NetworkScan;
+  handler_map["GetProxySettings"] =
+      &TestingAutomationProvider::GetProxySettings;
+  handler_map["SetProxySetting"] =
+      &TestingAutomationProvider::SetProxySetting;
   handler_map["ConnectToWifiNetwork"] =
       &TestingAutomationProvider::ConnectToWifiNetwork;
   handler_map["DisconnectFromWifiNetwork"] =
       &TestingAutomationProvider::DisconnectFromWifiNetwork;
 #endif  // defined(OS_CHROMEOS)
 
   std::map<std::string, BrowserJsonHandler> browser_handler_map;
   browser_handler_map["DisablePlugin"] =
       &TestingAutomationProvider::DisablePlugin;
   browser_handler_map["EnablePlugin"] =
@@ skipping 3242 matching lines @@
     // If you change this, update Observer for NotificationType::SESSION_END
     // below.
     MessageLoop::current()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &TestingAutomationProvider::OnRemoveProvider));
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }