Extract common per-network proxy configuration functions.

chrome/browser/chromeos/ui_proxy_config.cc

 // Copyright 2013 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/ui_proxy_config.h"
 
-#include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "net/proxy/proxy_config.h"
 
 namespace chromeos {
 
 UIProxyConfig::UIProxyConfig()
     : mode(MODE_DIRECT),
@@ skipping 76 matching lines @@
         socks_proxy.server = rules.fallback_proxies.Get();
       bypass_rules = rules.bypass_rules;
       return true;
     default:
       NOTREACHED() << "Unrecognized proxy config mode";
       break;
   }
   return false;
 }
 
-base::DictionaryValue* UIProxyConfig::ToPrefProxyConfig() {
+base::DictionaryValue* UIProxyConfig::ToPrefProxyConfig() const {
   switch (mode) {
     case MODE_DIRECT: {
       return ProxyConfigDictionary::CreateDirect();
     }
     case MODE_AUTO_DETECT: {
       return ProxyConfigDictionary::CreateAutoDetect();
     }
     case MODE_PAC_SCRIPT: {
       return ProxyConfigDictionary::CreatePacScript(
           automatic_proxy.pac_url.spec(), false);
@@ skipping 28 matching lines @@
   if (scheme == "https")
     return &https_proxy;
   if (scheme == "ftp")
     return &ftp_proxy;
   if (scheme == "socks")
     return &socks_proxy;
   NOTREACHED() << "Invalid scheme: " << scheme;
   return NULL;
 }
 
-bool UIProxyConfig::SerializeForNetwork(std::string* output) {
-  scoped_ptr<base::DictionaryValue> proxy_dict_ptr(ToPrefProxyConfig());
-  if (!proxy_dict_ptr.get())
-    return false;
-
-  // Return empty string for direct mode for portal check to work correctly.
-  base::DictionaryValue *dict = proxy_dict_ptr.get();
-  ProxyConfigDictionary proxy_dict(dict);
-  ProxyPrefs::ProxyMode mode;
-  if (proxy_dict.GetMode(&mode)) {
-    if (mode == ProxyPrefs::MODE_DIRECT) {
-      output->clear();
-      return true;
-    }
-  }
-  base::JSONWriter::Write(dict, output);
-  return true;
-}
-
 // static
 void UIProxyConfig::EncodeAndAppendProxyServer(const std::string& url_scheme,
                                                const net::ProxyServer& server,
                                                std::string* spec) {
   if (!server.is_valid())
     return;
 
   if (!spec->empty())
     *spec += ';';
 
   if (!url_scheme.empty()) {
     *spec += url_scheme;
     *spec += "=";
   }
   *spec += server.ToURI();
 }
 
 }  // namespace chromeos