Componentize proxy code from chrome/browser/net

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc

 // Copyright 2014 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/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #include "components/data_reduction_proxy/core/browser/data_store.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/proxy_config/proxy_prefs.h"
 #include "net/base/host_port_pair.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_list.h"
 #include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
 // Assume that any proxy host ending with this suffix is a Data Reduction Proxy.
@@ skipping 48 matching lines @@
   ProxyPrefMigrationResult proxy_pref_status =
       MigrateDataReductionProxyOffProxyPrefsHelper(prefs);
   UMA_HISTOGRAM_ENUMERATION("DataReductionProxy.ProxyPrefMigrationResult",
                             proxy_pref_status,
                             DataReductionProxyChromeSettings::PROXY_PREF_MAX);
 }
 
 DataReductionProxyChromeSettings::ProxyPrefMigrationResult
 DataReductionProxyChromeSettings::MigrateDataReductionProxyOffProxyPrefsHelper(
     PrefService* prefs) {
-  base::DictionaryValue* dict =
-      (base::DictionaryValue*)prefs->GetUserPrefValue(prefs::kProxy);
+  base::DictionaryValue* dict = (base::DictionaryValue*)prefs->GetUserPrefValue(
+      proxy_config::prefs::kProxy);
   if (!dict)
     return PROXY_PREF_NOT_CLEARED;
 
   // Clear empty "proxy" dictionary created by a bug. See http://crbug/448172.
   if (dict->empty()) {
-    prefs->ClearPref(prefs::kProxy);
+    prefs->ClearPref(proxy_config::prefs::kProxy);
     return PROXY_PREF_CLEARED_EMPTY;
   }
 
   std::string mode;
   if (!dict->GetString("mode", &mode))
     return PROXY_PREF_NOT_CLEARED;
   // Clear "system" proxy entry since this is the default. This entry was
   // created by bug (http://crbug/448172).
   if (ProxyModeToString(ProxyPrefs::MODE_SYSTEM) == mode) {
-    prefs->ClearPref(prefs::kProxy);
+    prefs->ClearPref(proxy_config::prefs::kProxy);
     return PROXY_PREF_CLEARED_MODE_SYSTEM;
   }
 
   // From M36 to M40, the DRP was configured using MODE_FIXED_SERVERS in the
   // proxy pref.
   if (ProxyModeToString(ProxyPrefs::MODE_FIXED_SERVERS) == mode) {
     std::string proxy_server;
     if (!dict->GetString("server", &proxy_server))
       return PROXY_PREF_NOT_CLEARED;
     net::ProxyConfig::ProxyRules proxy_rules;
     proxy_rules.ParseFromString(proxy_server);
     // Clear the proxy pref if it matches a currently configured Data Reduction
     // Proxy, or if the proxy host ends with ".googlezip.net", in order to
     // ensure that any DRP in the pref is cleared even if the DRP configuration
     // was changed. See http://crbug.com/476610.
     ProxyPrefMigrationResult rv;
     if (Config()->ContainsDataReductionProxy(proxy_rules))
       rv = PROXY_PREF_CLEARED_DRP;
     else if (ContainsDataReductionProxyDefaultHostSuffix(proxy_rules))
       rv = PROXY_PREF_CLEARED_GOOGLEZIP;
     else
       return PROXY_PREF_NOT_CLEARED;
 
-    prefs->ClearPref(prefs::kProxy);
+    prefs->ClearPref(proxy_config::prefs::kProxy);
     return rv;
   }
 
   // Before M35, the DRP was configured using a PAC script base64 encoded into a
   // PAC url.
   if (ProxyModeToString(ProxyPrefs::MODE_PAC_SCRIPT) == mode) {
     std::string pac_url;
     std::string pac_script;
     if (!dict->GetString("pac_url", &pac_url) ||
         !GetEmbeddedPacScript(pac_url, &pac_script)) {
       return PROXY_PREF_NOT_CLEARED;
     }
 
     // In M35 and earlier, the way of specifying the DRP in a PAC script would
     // always include the port number after the host even if the port number
     // could be implied, so searching for ".googlezip.net:" in the PAC script
     // indicates whether there's a proxy in that PAC script with a host of the
     // form "*.googlezip.net".
     if (pac_script.find(".googlezip.net:") == std::string::npos)
       return PROXY_PREF_NOT_CLEARED;
 
-    prefs->ClearPref(prefs::kProxy);
+    prefs->ClearPref(proxy_config::prefs::kProxy);
     return PROXY_PREF_CLEARED_PAC_GOOGLEZIP;
   }
 
   return PROXY_PREF_NOT_CLEARED;
 }
 
 DataReductionProxyChromeSettings::DataReductionProxyChromeSettings()
     : data_reduction_proxy::DataReductionProxySettings() {
 }
 
@@ skipping 59 matching lines @@
 #elif defined(OS_OPENBSD)
   return data_reduction_proxy::Client::CHROME_OPENBSD;
 #elif defined(OS_SOLARIS)
   return data_reduction_proxy::Client::CHROME_SOLARIS;
 #elif defined(OS_QNX)
   return data_reduction_proxy::Client::CHROME_QNX;
 #else
   return data_reduction_proxy::Client::UNKNOWN;
 #endif
 }