Proxy settings automation hooks and related proxy settings fixes.

chrome/browser/automation/testing_automation_provider.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_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #define CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 1016 matching lines @@
 
   void SignoutInScreenLocker(DictionaryValue* args,
                              IPC::Message* reply_message);
 
   void GetBatteryInfo(DictionaryValue* args, IPC::Message* reply_message);
 
   void GetNetworkInfo(DictionaryValue* args, IPC::Message* reply_message);
 
   void NetworkScan(DictionaryValue* args, IPC::Message* reply_message);
 
+  void GetProxySettings(DictionaryValue* args, IPC::Message* reply_message);
+
+  void SetProxySettings(DictionaryValue* args, IPC::Message* reply_message);
+
   void ConnectToWifiNetwork(DictionaryValue* args, IPC::Message* reply_message);
 
   void DisconnectFromWifiNetwork(DictionaryValue* args,
                                  IPC::Message* reply_message);
 #endif  // defined(OS_CHROMEOS)
 
   void WaitForTabCountToBecome(int browser_handle,
                                int target_tab_count,
                                IPC::Message* reply_message);
 
@@ skipping 56 matching lines @@
   // Used to enumerate browser profiles.
   scoped_refptr<ImporterList> importer_list_;
 
   // The stored data for the ImportSettings operation.
   ImportSettingsData import_settings_data_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_