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

chrome/browser/automation/testing_automation_provider_chromeos.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 "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
@@ skipping 50 matching lines @@
 
 DictionaryValue* GetNetworkInfoDict(const chromeos::Network* network) {
   DictionaryValue* item = new DictionaryValue;
   item->SetString("name", network->name());
   item->SetString("device_path", network->device_path());
   item->SetString("ip_address", network->ip_address());
   item->SetString("status", network->GetStateString());
   return item;
 }
 
-Value* GetProxySetting(const std::string& setting_name) {
-  chromeos::ProxyCrosSettingsProvider settings_provider;
+Value* GetProxySetting(Browser* browser, const std::string& setting_name) {
+  chromeos::ProxyCrosSettingsProvider settings_provider(browser->profile());
   std::string setting_path = "cros.session.proxy.";
   setting_path.append(setting_name);
 
   if (setting_name == "ignorelist") {
     Value* value;
     if (settings_provider.Get(setting_path, &value))
       return value;
   } else {
     Value* setting;
     if (settings_provider.Get(setting_path, &setting)) {
@@ skipping 426 matching lines @@
     network_library->EnableWifiNetworkDevice(enable);
   } else if (device == "cellular") {
     network_library->EnableCellularNetworkDevice(enable);
   } else {
     reply.SendError(
         "Unknown device. Valid devices are ethernet, wifi, cellular.");
     return;
   }
 }
 
-void TestingAutomationProvider::GetProxySettings(DictionaryValue* args,
+void TestingAutomationProvider::GetProxySettings(Browser* browser,
+                                                 DictionaryValue* args,
                                                  IPC::Message* reply_message) {
   const char* settings[] = { "pacurl", "singlehttp", "singlehttpport",
                              "httpurl", "httpport", "httpsurl", "httpsport",
                              "type", "single", "ftpurl", "ftpport",
                              "socks", "socksport", "ignorelist" };
 
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  chromeos::ProxyCrosSettingsProvider settings_provider;
+  chromeos::ProxyCrosSettingsProvider settings_provider(browser->profile());
 
   for (size_t i = 0; i < arraysize(settings); ++i) {
-    Value* setting = GetProxySetting(settings[i]);
+    Value* setting = GetProxySetting(browser, settings[i]);
     if (setting)
       return_value->Set(settings[i], setting);
   }
 
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
-void TestingAutomationProvider::SetProxySettings(DictionaryValue* args,
+void TestingAutomationProvider::SetProxySettings(Browser* browser,
+                                                 DictionaryValue* args,
                                                 IPC::Message* reply_message) {

[Mattias Nissler (ping if slow), 2011/10/25 12:43:11]

indentation

[kuan, 2011/10/25 16:01:50]

Done.

   AutomationJSONReply reply(this, reply_message);
   std::string key;
   Value* value;
   if (!args->GetString("key", &key) || !args->Get("value", &value)) {
     reply.SendError("Invalid or missing args.");
     return;
   }
 
   std::string setting_path = "cros.session.proxy.";
   setting_path.append(key);
 
   // ProxyCrosSettingsProvider will own the Value* passed to Set().
-  chromeos::ProxyCrosSettingsProvider().Set(setting_path, value->DeepCopy());
+  chromeos::ProxyCrosSettingsProvider(browser->profile()).Set(setting_path,
+      value->DeepCopy());
   reply.SendSuccess(NULL);
 }
 
 void TestingAutomationProvider::ConnectToCellularNetwork(
     DictionaryValue* args, IPC::Message* reply_message) {
   if (!EnsureCrosLibraryLoaded(this, reply_message))
     return;
 
   std::string service_path;
   if (!args->GetString("service_path", &service_path)) {
@@ skipping 631 matching lines @@
 
   // Set up an observer (it will delete itself).
   take_photo_dialog->AddObserver(new PhotoCaptureObserver(
       this, reply_message));
 
   views::Widget* window = browser::CreateViewsWindow(
       browser->window()->GetNativeHandle(), take_photo_dialog);
   window->SetAlwaysOnTop(true);
   window->Show();
 }