Refactor proxy handling for ChromeOS to not go through the CrosSettings interface.

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"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/cros/update_library.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
-#include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
+#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 21 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(Browser* browser, const std::string& setting_name) {
-  chromeos::ProxyCrosSettingsProvider settings_provider(browser->profile());
+base::Value* GetProxySetting(Browser* browser,
+                             const std::string& setting_name) {
   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;
+    base::Value* value;
+    if (chromeos::ProxyCrosSettingsParser::GetProxyPrefValue(
+        browser->profile(), setting_path, &value)) {

[Mattias Nissler (ping if slow), 2011/11/08 09:25:22]

+4 indentation

[pastarmovj, 2011/11/09 17:51:53]

Done.

+       return value;
+    }
   } else {
-    Value* setting;
-    if (settings_provider.Get(setting_path, &setting)) {
+    base::Value* setting;
+    if (chromeos::ProxyCrosSettingsParser::GetProxyPrefValue(
+            browser->profile(), setting_path, &setting)) {
       DictionaryValue* setting_dict = static_cast<DictionaryValue*>(setting);
-      Value* value;
+      base::Value* value;
       bool found = setting_dict->Remove("value", &value);
       delete setting;
       if (found)
         return value;
     }
   }
   return NULL;
 }
 
 const char* UpdateStatusToString(chromeos::UpdateStatusOperation status) {
@@ skipping 366 matching lines @@
   }
 
   // Remembered Wifi Networks.
   const chromeos::WifiNetworkVector& remembered_wifi =
       network_library->remembered_wifi_networks();
   ListValue* items = new ListValue;
   for (chromeos::WifiNetworkVector::const_iterator iter =
        remembered_wifi.begin(); iter != remembered_wifi.end();
        ++iter) {
       const chromeos::WifiNetwork* wifi = *iter;
-      items->Append(Value::CreateStringValue(wifi->service_path()));
+      items->Append(base::Value::CreateStringValue(wifi->service_path()));
   }
   return_value->Set("remembered_wifi", items);
 
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::NetworkScan(DictionaryValue* args,
                                             IPC::Message* reply_message) {
   if (!EnsureCrosLibraryLoaded(this, reply_message))
     return;
@@ skipping 38 matching lines @@
 
 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(browser->profile());
 
   for (size_t i = 0; i < arraysize(settings); ++i) {
-    Value* setting = GetProxySetting(browser, settings[i]);
+    base::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(Browser* browser,
                                                  DictionaryValue* args,
                                                  IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   std::string key;
-  Value* value;
+  base::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(browser->profile()).Set(setting_path,
-      value->DeepCopy());
+  chromeos::ProxyCrosSettingsParser::SetProxyPrefValue(
+      browser->profile(), setting_path, value);
   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 636 matching lines @@
   views::Widget* window = browser::CreateViewsWindow(
       browser->window()->GetNativeHandle(), take_photo_dialog);
   window->SetAlwaysOnTop(true);
   window->Show();
 }
 
 void TestingAutomationProvider::PowerChanged(
     const chromeos::PowerSupplyStatus& status) {
   power_status = status;
 }