Proxy settings automation hooks and related proxy settings fixes.

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 5968c6c77e41a2d8d9b73e98b8d760673c22a5e7..0459412ca5bc7a2be7a6391ea11585380695bf49 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -2087,6 +2087,10 @@ void TestingAutomationProvider::SendJSONRequest(int handle,
 
   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"] =