redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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 <set>
 #include <string>
 #include <vector>
@@ skipping 2323 matching lines @@
   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["ToggleNetworkDevice"] =
       &TestingAutomationProvider::ToggleNetworkDevice;
-  handler_map["GetProxySettings"] =
-      &TestingAutomationProvider::GetProxySettings;
-  handler_map["SetProxySettings"] =
-      &TestingAutomationProvider::SetProxySettings;
   handler_map["ConnectToCellularNetwork"] =
       &TestingAutomationProvider::ConnectToCellularNetwork;
   handler_map["DisconnectFromCellularNetwork"] =
       &TestingAutomationProvider::DisconnectFromCellularNetwork;
   handler_map["ConnectToWifiNetwork"] =
       &TestingAutomationProvider::ConnectToWifiNetwork;
   handler_map["ConnectToHiddenWifiNetwork"] =
       &TestingAutomationProvider::ConnectToHiddenWifiNetwork;
   handler_map["DisconnectFromWifiNetwork"] =
       &TestingAutomationProvider::DisconnectFromWifiNetwork;
@@ skipping 188 matching lines @@
   browser_handler_map["SetNTPMenuMode"] =
       &TestingAutomationProvider::SetNTPMenuMode;
 
   browser_handler_map["LaunchApp"] = &TestingAutomationProvider::LaunchApp;
   browser_handler_map["SetAppLaunchType"] =
       &TestingAutomationProvider::SetAppLaunchType;
 #if defined(OS_CHROMEOS)
   browser_handler_map["CaptureProfilePhoto"] =
       &TestingAutomationProvider::CaptureProfilePhoto;
   browser_handler_map["GetTimeInfo"] = &TestingAutomationProvider::GetTimeInfo;
+  browser_handler_map["GetProxySettings"] =
+      &TestingAutomationProvider::GetProxySettings;
+  browser_handler_map["SetProxySettings"] =
+      &TestingAutomationProvider::SetProxySettings;
 #endif  // defined(OS_CHROMEOS)
 
   // Look for command in handlers that take a Browser handle.
   if (browser_handler_map.find(std::string(command)) !=
              browser_handler_map.end()) {
     Browser* browser = NULL;
     // Get Browser object associated with handle.
     if (!browser_tracker_->ContainsHandle(handle) ||
         !(browser = browser_tracker_->GetResource(handle))) {
       // Browser not found; attempt to fallback to non-Browser handlers.
@@ skipping 3962 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }