Move some proxy config code out of src/chrome

chromeos/network/proxy/ui_proxy_config_service.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_service.h"
+#include "chromeos/network/proxy/ui_proxy_config_service.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/net/proxy_config_handler.h"
-#include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/proxy/proxy_config_handler.h"
+#include "chromeos/network/proxy/proxy_config_service_impl.h"
 #include "components/device_event_log/device_event_log.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "net/proxy/proxy_config.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* ModeToString(UIProxyConfig::Mode mode) {
   switch (mode) {
@@ skipping 31 matching lines @@
 
 // Returns true if proxy settings from |onc_source| are editable.
 bool IsNetworkProxySettingsEditable(const onc::ONCSource onc_source) {
   return onc_source != onc::ONC_SOURCE_DEVICE_POLICY &&
          onc_source != onc::ONC_SOURCE_USER_POLICY;
 }
 
 }  // namespace
 
 UIProxyConfigService::UIProxyConfigService()
-    : profile_prefs_(nullptr), local_state_prefs_(nullptr) {
-}
+    : profile_prefs_(nullptr), local_state_prefs_(nullptr) {}
 
-UIProxyConfigService::~UIProxyConfigService() {
-}
+UIProxyConfigService::~UIProxyConfigService() {}
 
 void UIProxyConfigService::SetPrefs(PrefService* profile_prefs,
                                     PrefService* local_state_prefs) {
   profile_prefs_ = profile_prefs;
   local_state_prefs_ = local_state_prefs;
 }
 
 void UIProxyConfigService::SetCurrentNetworkGuid(
     const std::string& current_guid) {
   current_ui_network_guid_ = current_guid;
@@ skipping 55 matching lines @@
     const NetworkState& network) {
   DCHECK(local_state_prefs_);
 
   // The pref service to read proxy settings that apply to all networks.
   // Settings from the profile overrule local state.
   PrefService* top_pref_service =
       profile_prefs_ ? profile_prefs_ : local_state_prefs_;
 
   // Get prefs proxy config if available.
   net::ProxyConfig pref_config;
-  ProxyPrefs::ConfigState pref_state = ProxyConfigServiceImpl::ReadPrefConfig(
-      top_pref_service, &pref_config);
+  ProxyPrefs::ConfigState pref_state =
+      ProxyConfigServiceImpl::ReadPrefConfig(top_pref_service, &pref_config);
 
   // Get network proxy config if available.
   net::ProxyConfig network_config;
   net::ProxyConfigService::ConfigAvailability network_availability =
       net::ProxyConfigService::CONFIG_UNSET;
   onc::ONCSource onc_source = onc::ONC_SOURCE_NONE;
-  if (chromeos::GetProxyConfig(profile_prefs_,
-                               local_state_prefs_,
-                               network,
-                               &network_config,
-                               &onc_source)) {
+  if (chromeos::GetProxyConfig(profile_prefs_, local_state_prefs_, network,
+                               &network_config, &onc_source)) {
     // Network is private or shared with user using shared proxies.
     VLOG(1) << this << ": using proxy of network: " << network.path();
     network_availability = net::ProxyConfigService::CONFIG_VALID;
   }
 
   // Determine effective proxy config, either from prefs or network.
   ProxyPrefs::ConfigState effective_config_state;
   net::ProxyConfig effective_config;
   ProxyConfigServiceImpl::GetEffectiveProxyConfig(
-      pref_state, pref_config,
-      network_availability, network_config, false,
+      pref_state, pref_config, network_availability, network_config, false,
       &effective_config_state, &effective_config);
 
   // Store effective proxy into |current_ui_config_|.
   current_ui_config_.FromNetProxyConfig(effective_config);
   current_ui_config_.state = effective_config_state;
   if (ProxyConfigServiceImpl::PrefPrecedes(effective_config_state)) {
     current_ui_config_.user_modifiable = false;
   } else if (!IsNetworkProxySettingsEditable(onc_source)) {
     current_ui_config_.state = ProxyPrefs::CONFIG_POLICY;
     current_ui_config_.user_modifiable = false;
   } else {
     current_ui_config_.user_modifiable = !ProxyConfigServiceImpl::IgnoreProxy(
         profile_prefs_, network.profile_path(), onc_source);
   }
 }
 
 }  // namespace chromeos