NetworkHandler: Add ui_proxy_config_service

chrome/browser/chromeos/proxy_cros_settings_parser.cc

 // Copyright (c) 2012 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/chromeos/proxy_cros_settings_parser.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
@@ skipping 90 matching lines @@
 
 // We have to explicitly export this because the arraysize macro doesn't like
 // extern arrays as their size is not known on compile time.
 const size_t kProxySettingsCount = arraysize(kProxySettings);
 
 bool IsProxyPref(const std::string& path) {
   return base::StartsWith(path, kProxyPrefsPrefix,
                           base::CompareCase::SENSITIVE);
 }
 
-void SetProxyPrefValue(const std::string& path,
+void SetProxyPrefValue(const std::string& network_guid,
+                       const std::string& path,
                        const base::Value* in_value,
                        UIProxyConfigService* config_service) {
   if (!in_value) {
     NOTREACHED();
     return;
   }
 
   // Retrieve proxy config.
   UIProxyConfig config;
-  config_service->GetProxyConfig(&config);
+  config_service->GetProxyConfig(network_guid, &config);
 
   if (path == kProxyPacUrl) {
     std::string val;
     if (in_value->GetAsString(&val)) {
       GURL url(val);
       if (url.is_valid())
         config.SetPacUrl(url);
       else
         config.mode = UIProxyConfig::MODE_AUTO_DETECT;
     }
@@ skipping 136 matching lines @@
         if (list_value->GetString(x, &val))
           bypass_rules.AddRuleFromString(val);
       }
       config.SetBypassRules(bypass_rules);
     }
   } else {
     LOG(WARNING) << "Unknown proxy settings path " << path;
     return;
   }
 
-  config_service->SetProxyConfig(config);
+  config_service->SetProxyConfig(network_guid, config);
 }
 
-bool GetProxyPrefValue(const UIProxyConfigService& config_service,
+bool GetProxyPrefValue(const std::string& network_guid,
                        const std::string& path,
+                       UIProxyConfigService* config_service,
                        base::Value** out_value) {
   std::string controlled_by;
   base::Value* data = NULL;
   UIProxyConfig config;
-  config_service.GetProxyConfig(&config);
+  config_service->GetProxyConfig(network_guid, &config);
 
   if (path == kProxyPacUrl) {
     // Only show pacurl for pac-script mode.
     if (config.mode == UIProxyConfig::MODE_PAC_SCRIPT &&
         config.automatic_proxy.pac_url.is_valid()) {
       data = new base::StringValue(config.automatic_proxy.pac_url.spec());
     }
   } else if (path == kProxySingleHttp) {
     data = CreateServerHostValue(config.single_proxy);
   } else if (path == kProxySingleHttpPort) {
@@ skipping 68 matching lines @@
   } else {
     dict->SetBoolean("disabled", false);
   }
   *out_value = dict;
   return true;
 }
 
 }  // namespace proxy_cros_settings_parser
 
 }  // namespace chromeos