Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

chrome/browser/chromeos/proxy_config_service_impl.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_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/bind.h"
-#include "base/json/json_string_value_serializer.h"
+#include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
+#include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/network_property_ui_data.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/network/network_profile.h"
+#include "chromeos/network/network_profile_handler.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace em = enterprise_management;
 
 namespace chromeos {
@@ skipping 51 matching lines @@
       return "config_network";  // For ChromeOS, system is network.
     case ProxyPrefs::CONFIG_FALLBACK:
       return "config_recommended";  // Fallback is recommended.
     case ProxyPrefs::CONFIG_UNSET:
       return "config_unset";
   }
   NOTREACHED() << "Unrecognized config state type";
   return "";
 }
 
-// Returns true if proxy settings from |network| is editable.
-bool IsNetworkProxySettingsEditable(const Network* network) {
-  if (!network)
-    return true;  // editable if no network given.
+// Returns true if proxy settings of |network_state| are editable.
+bool IsNetworkProxySettingsEditable(const NetworkState& network_state) {
+  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  Network* network = network_library->FindNetworkByPath(network_state.path());
 
-  NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
+  if (!network) {
+    LOG(ERROR) << "Could not find network " << network_state.path()
+               << " in NetworkLibrary. Falling back to user-editable proxy"
+               << " settings";
+    return true;
+  }

[stevenjb, 2013/05/08 20:32:09]

Mixing NetworkLibrary and NetworkStateHandler is prone to all sorts of bad edge
cases; we should avoid it.

Here it looks like we only need unique_id and ui_data.

So far I have avoided adding UIData to NetworkState, but I don't have any
particular objections to adding it if it makes code like this easier (otherwise
we would have to request it asynchronously which might be a pain).

The unique_id logic could easily be added to
NetworkState::InitialPropertiesReceived(). I suspect that we can just store it
in guid_, but we can add another member if that is not the case (or we are
unsure).

[pneubeck (no reviews), 2013/05/10 10:58:52]

I removed the dependency of NetworkPropertyUIData on NetworkUIData. And
unique_id in the context of policy is actually guid.

We cannot remove the network_library->FindOncForNetwork() call for now, as
policies are still applied by NetworkLibrary.

I could switch over to the new code for policy application, but that would
require to replace all calls to network_library->FindOncForNetwork in the old UI
code by some call to ManagedNetworkConfigHandler. It's not much to change, but
maybe we don't want to have that dependency?

I thought about that step previously. But I'm not sure if that's worth it.

+
   const base::DictionaryValue* onc =
        network_library->FindOncForNetwork(network->unique_id());
 
   NetworkPropertyUIData proxy_settings_ui_data;
   proxy_settings_ui_data.ParseOncProperty(
       network->ui_data(),
       onc,
       onc::network_config::kProxySettings);
   return proxy_settings_ui_data.editable();
 }
@@ skipping 116 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;
 }
 
-DictionaryValue* ProxyConfigServiceImpl::ProxyConfig::ToPrefProxyConfig() {
+base::DictionaryValue*
+    ProxyConfigServiceImpl::ProxyConfig::ToPrefProxyConfig() {
   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 93 matching lines @@
   return true;
 }
 
 bool ProxyConfigServiceImpl::ProxyConfig::SerializeForNetwork(
     std::string* output) {
   scoped_ptr<DictionaryValue> proxy_dict_ptr(ToPrefProxyConfig());
   if (!proxy_dict_ptr.get())
     return false;
 
   // Return empty string for direct mode for portal check to work correctly.
-  DictionaryValue *dict = proxy_dict_ptr.get();
+  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;
     }
   }
-  JSONStringValueSerializer serializer(output);
-  return serializer.Serialize(*dict);
+  base::JSONWriter::Write(dict, output);
+  return true;
 }
 
 //----------- ProxyConfigServiceImpl::ProxyConfig: private methods -------------
 
 // static
 void ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(
     const std::string& url_scheme,
     const net::ProxyServer& server,
     std::string* spec) {
   if (!server.is_valid())
@@ skipping 19 matching lines @@
   // Register for notifications of UseSharedProxies user preference.
   if (pref_service->FindPreference(prefs::kUseSharedProxies)) {
     use_shared_proxies_.Init(
         prefs::kUseSharedProxies, pref_service,
         base::Bind(&ProxyConfigServiceImpl::OnUseSharedProxiesChanged,
                    base::Unretained(this)));
   }
 
   FetchProxyPolicy();
 
-  // Register for shill network notifications.
-  NetworkLibrary* network_lib = CrosLibrary::Get()->GetNetworkLibrary();
-  OnActiveNetworkChanged(network_lib, network_lib->active_network());
-  network_lib->AddNetworkManagerObserver(this);
+  // Register for changes to the default network.
+  NetworkStateHandler* state_handler = NetworkStateHandler::Get();
+  state_handler->AddObserver(this);
+  DefaultNetworkChanged(state_handler->DefaultNetwork());
 }
 
 ProxyConfigServiceImpl::~ProxyConfigServiceImpl() {
-  NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
-  if (netlib) {
-    netlib->RemoveNetworkManagerObserver(this);
-    netlib->RemoveObserverForAllNetworks(this);
-  }
+  NetworkStateHandler::Get()->RemoveObserver(this);
 }
 
 void ProxyConfigServiceImpl::UISetCurrentNetwork(
     const std::string& current_network) {
-  Network* network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
-      current_network);
+  const NetworkState* network =
+      NetworkStateHandler::Get()->GetNetworkState(current_network);
   if (!network) {
     ResetUICache();
     LOG(ERROR) << "Can't find requested network " << current_network;
     return;
   }
   current_ui_network_ = current_network;
-  OnUISetCurrentNetwork(network);
+
+  DetermineEffectiveConfig(network, false);
+  VLOG(1) << "Current ui network: "
+          << network->name()
+          << ", " << ModeToString(current_ui_config_.mode)
+          << ", " << ConfigStateToString(current_ui_config_.state)
+          << ", modifiable:" << current_ui_config_.user_modifiable;
+  // Notify observers.
+  std::vector<base::Closure>::iterator iter = callbacks_.begin();
+  while (iter != callbacks_.end()) {
+    if (iter->is_null()) {
+      iter = callbacks_.erase(iter);
+    } else {
+      iter->Run();
+      ++iter;
+    }
+  }
 }
 
-void ProxyConfigServiceImpl::UIMakeActiveNetworkCurrent() {
-  Network* network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
-      active_network_);
-  if (!network) {
-    ResetUICache();
-    LOG(ERROR) << "Can't find requested network " << active_network_;
-    return;
-  }
-  current_ui_network_ = active_network_;
-  OnUISetCurrentNetwork(network);
+void ProxyConfigServiceImpl::UIMakeDefaultNetworkCurrent() {
+  const NetworkState* default_network =
+      NetworkStateHandler::Get()->DefaultNetwork();
+  UISetCurrentNetwork(
+      default_network ? default_network->path() : std::string());
 }
 
 void ProxyConfigServiceImpl::UIGetCurrentNetworkName(
     std::string* network_name) {
   if (!network_name)
     return;
   network_name->clear();
   Network* network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
       current_ui_network_);

[stevenjb, 2013/05/08 20:32:09]

I don't see anything here that can't use NetworkState.

[pneubeck (no reviews), 2013/05/10 10:58:52]

I tried to not change the UI part too much.

   if (!network) {
     LOG(ERROR) << "Can't find requested network " << current_ui_network_;
     return;
   }
   if (network->name().empty() && network->type() == chromeos::TYPE_ETHERNET) {
     *network_name =
         l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   } else {
     *network_name = network->name();
   }
 }
 
 void ProxyConfigServiceImpl::UIGetProxyConfig(ProxyConfig* config) {
   // Simply returns the copy last set from UI via UISetCurrentNetwork or
-  // UIMakeActiveNetworkCurrent.
+  // UIMakeDefaultNetworkCurrent.
   *config = current_ui_config_;
 }
 
 bool ProxyConfigServiceImpl::UISetProxyConfigToDirect() {
   current_ui_config_.mode = ProxyConfig::MODE_DIRECT;
   OnUISetProxyConfig();
   return true;
 }
 
 bool ProxyConfigServiceImpl::UISetProxyConfigToAutoDetect() {
@@ skipping 58 matching lines @@
       findIfEqual(callbacks_.begin(), callbacks_.end(), callback);
   if (iter != callbacks_.end())
     callbacks_.erase(iter);
 }
 
 void ProxyConfigServiceImpl::OnProxyConfigChanged(
     ProxyPrefs::ConfigState config_state,
     const net::ProxyConfig& config) {
   VLOG(1) << "Got prefs change: " << ConfigStateToString(config_state)
           << ", mode=" << config.proxy_rules().type;
-  Network* network = NULL;
-  if (!active_network_.empty()) {
-    network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
-        active_network_);
-    if (!network)
-      LOG(ERROR) << "can't find requested network " << active_network_;
-  }
-  DetermineEffectiveConfig(network, true);
-}
-
-void ProxyConfigServiceImpl::OnNetworkManagerChanged(
-    NetworkLibrary* network_lib) {
-  VLOG(1) << "OnNetworkManagerChanged: use-shared-proxies="
-          << GetUseSharedProxies();
-  OnActiveNetworkChanged(network_lib, network_lib->active_network());
-}
-
-void ProxyConfigServiceImpl::OnNetworkChanged(NetworkLibrary* network_lib,
-    const Network* network) {
-  if (!network)
-    return;
-  VLOG(1) << "OnNetworkChanged: "
-          << (network->name().empty() ? network->service_path() :
-                                        network->name())
-          << ", use-shared-proxies=" << GetUseSharedProxies();
-  // We only care about active network.
-  if (network == network_lib->active_network())
-    OnActiveNetworkChanged(network_lib, network);
+  UpdateProxyConfigOfDefaultNetwork();
 }
 
 // static
-bool ProxyConfigServiceImpl::ParseProxyConfig(const Network* network,
+bool ProxyConfigServiceImpl::ParseProxyConfig(const NetworkState& network,
                                               net::ProxyConfig* proxy_config) {
-  if (!network || !proxy_config)
+  if (!proxy_config || network.proxy_config().empty())
     return false;
-  JSONStringValueSerializer serializer(network->proxy_config());
-  scoped_ptr<Value> value(serializer.Deserialize(NULL, NULL));
-  if (!value.get() || value->GetType() != Value::TYPE_DICTIONARY)
-    return false;
-  ProxyConfigDictionary proxy_dict(static_cast<DictionaryValue*>(value.get()));
+
+  ProxyConfigDictionary proxy_dict(&network.proxy_config());
   return PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(proxy_dict,
                                                            proxy_config);
 }
 
 // static
 void ProxyConfigServiceImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   // Use shared proxies default to off.  GetUseSharedProxies will return the
   // correct value based on pre-login and login.
   registry->RegisterBooleanPref(prefs::kUseSharedProxies, true);
 }
 
 // static
 void ProxyConfigServiceImpl::RegisterUserPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kUseSharedProxies,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 //------------------ ProxyConfigServiceImpl: private methods -------------------
 
 void ProxyConfigServiceImpl::OnUseSharedProxiesChanged() {
   VLOG(1) << "New use-shared-proxies = " << GetUseSharedProxies();
-
-  // Determine new proxy config which may have changed because of new
-  // use-shared-proxies. If necessary, activate it.
-  Network* network = NULL;
-  if (!active_network_.empty()) {
-    network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
-        active_network_);
-    if (!network)
-      LOG(WARNING) << "Can't find requested network " << active_network_;
-  }
-  DetermineEffectiveConfig(network, true);
+  UpdateProxyConfigOfDefaultNetwork();
 }
 
 void ProxyConfigServiceImpl::OnUISetProxyConfig() {
   if (current_ui_network_.empty())
     return;
   // Update config to shill.
   std::string value;
   if (current_ui_config_.SerializeForNetwork(&value)) {
     VLOG(1) << "Set proxy (mode=" << current_ui_config_.mode
             << ") for " << current_ui_network_;
     current_ui_config_.state = ProxyPrefs::CONFIG_SYSTEM;
     SetProxyConfigForNetwork(current_ui_network_, value, false);
   }
 }
 
-void ProxyConfigServiceImpl::OnActiveNetworkChanged(NetworkLibrary* network_lib,
-    const Network* active_network) {
-  std::string new_network;
-  if (active_network)
-    new_network = active_network->service_path();
+void ProxyConfigServiceImpl::DefaultNetworkChanged(
+    const NetworkState* new_network) {
+  std::string new_network_path;
+  if (new_network)
+    new_network_path = new_network->path();
 
-  if (active_network_ == new_network) {  // Same active network.
-    VLOG(1) << "Same active network: "
-            << (new_network.empty() ? "empty" :
-                    (active_network->name().empty() ?
-                         new_network : active_network->name()));
-    // Even though network is the same, its proxy config (e.g. if private
-    // version of network replaces the shared version after login), or
-    // use-shared-proxies setting (e.g. after login) may have changed,
-    // so re-determine effective proxy config, and activate if different.
-    if (active_network) {
-      VLOG(1) << "Profile=" << active_network->profile_type()
-              << "," << active_network->profile_path()
-              << ", proxy=" << active_network->proxy_config();
-      DetermineEffectiveConfig(active_network, true);
-    }
-    return;
-  }
+  VLOG(1) << "DefaultNetworkChanged: network "
+          << default_network_ << " -> " << new_network_path << ".";
+  VLOG_IF(1, new_network) << "New network: name=" << new_network->name()
+                          << ", proxy=" << new_network->proxy_config()
+                          << ", profile=" << new_network->profile_path();
 
-  // If there was a previous active network, remove it as observer.
-  if (!active_network_.empty())
-    network_lib->RemoveNetworkObserver(active_network_, this);
+  default_network_ = new_network_path;
 
-  active_network_ = new_network;
+  // Even if the default network is the same, its proxy config (e.g. if private
+  // version of network replaces the shared version after login), or
+  // use-shared-proxies setting (e.g. after login) may have changed, so
+  // re-determine effective proxy config, and activate if different.
 
-  if (active_network_.empty()) {
-    VLOG(1) << "New active network: empty";
-    DetermineEffectiveConfig(active_network, true);
-    return;
-  }
-
-  VLOG(1) << "New active network: path=" << active_network->service_path()
-          << ", name=" << active_network->name()
-          << ", profile=" << active_network->profile_type()
-          << "," << active_network->profile_path()
-          << ", proxy=" << active_network->proxy_config();
-
-  // Register observer for new network.
-  network_lib->AddNetworkObserver(active_network_, this);
-
-  // If necessary, migrate config to shill.
-  if (active_network->proxy_config().empty() && !device_config_.empty()) {
-    VLOG(1) << "Try migrating device config to " << active_network_;
-    SetProxyConfigForNetwork(active_network_, device_config_, true);
+  // If necessary, migrate device proxy settings to per network settings.
+  if (new_network && new_network->proxy_config().empty() &&
+      !device_config_.empty()) {
+    VLOG(1) << "Try migrating device config to " << new_network_path;
+    SetProxyConfigForNetwork(new_network_path, device_config_, true);
+    // This will trigger a notification afterwards, so application
+    // of the migrated proxy config is not necessary here.
   } else  {
-    // Otherwise, determine and activate possibly new effective proxy config.
-    DetermineEffectiveConfig(active_network, true);
+    UpdateProxyConfigOfDefaultNetwork();
   }
 }
 
 void ProxyConfigServiceImpl::SetProxyConfigForNetwork(
     const std::string& network_path, const std::string& value,
     bool only_set_if_empty) {
   Network* network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
       network_path);
   if (!network) {
     NOTREACHED() << "Can't find requested network " << network_path;
     return;
   }
   if (!only_set_if_empty || network->proxy_config().empty()) {
     network->SetProxyConfig(value);

[stevenjb, 2013/05/08 20:32:09]

We should switch to using NetworkConfigurationHandler for this at the same time.

[pneubeck (no reviews), 2013/05/10 10:58:52]

What means "at the same time"?
The problem with using the new config handler is, that NetworkLibrary will
likely get out of sync, and I don't know what the implications would be.

A possible solution coulde be:
Move storage of ProxyConfig out of Shill and use the config handler in parallel
to NetworkLibrary only for:
  - ProxyConfig
  - policy application (see larger comment above)
Remove all references to ProxyConfig from NetworkLibrary.

     VLOG(1) << "Set proxy for "
             << (network->name().empty() ? network_path : network->name())
             << ", value=" << value;
-    if (network_path == active_network_)
-      DetermineEffectiveConfig(network, true);
+    // Even in case the default network was changed, there's no need to apply
+    // the new proxy settings, because we will be notified afterwards.
   }
 }
 
 bool ProxyConfigServiceImpl::GetUseSharedProxies() {
   const PrefService::Preference* use_shared_proxies_pref =
       prefs()->FindPreference(prefs::kUseSharedProxies);
   if (!use_shared_proxies_pref) {
     // Make sure that proxies are always enabled at sign in screen.
     return !UserManager::Get()->IsUserLoggedIn();
   }
   return use_shared_proxies_.GetValue();
 }
 
-bool ProxyConfigServiceImpl::IgnoreProxy(const Network* network) {
-  if (network->profile_type() == PROFILE_USER)
+bool ProxyConfigServiceImpl::IgnoreProxy(const NetworkState& network) {
+  const NetworkProfile* profile =
+      NetworkProfileHandler::Get()->GetProfileForPath(network.profile_path());
+  if (!profile)
+    return true;
+  if (profile->type() == NetworkProfile::TYPE_USER)
     return false;
 
-  if (network->ui_data().onc_source() == onc::ONC_SOURCE_DEVICE_POLICY &&
+  if (network.onc_source() == onc::ONC_SOURCE_DEVICE_POLICY &&
       UserManager::Get()->IsUserLoggedIn()) {
     policy::BrowserPolicyConnector* connector =
         g_browser_process->browser_policy_connector();
     const User* logged_in_user = UserManager::Get()->GetLoggedInUser();
     if (connector->GetUserAffiliation(logged_in_user->email()) ==
             policy::USER_AFFILIATION_MANAGED) {
-      VLOG(1) << "Respecting proxy for network " << network->name()
+      VLOG(1) << "Respecting proxy for network " << network.name()
               << ", as logged-in user belongs to the domain the device "
               << "is enrolled to.";
       return false;
     }
   }
 
   return !GetUseSharedProxies();
 }
 
-void ProxyConfigServiceImpl::DetermineEffectiveConfig(const Network* network,
-                                                      bool activate) {
+void ProxyConfigServiceImpl::UpdateProxyConfigOfDefaultNetwork() {
+  const NetworkState* network = NetworkStateHandler::Get()->DefaultNetwork();
+  LOG_IF(ERROR, network && network->path() != default_network_)
+      << "Missed network change notification: " << default_network_
+      << " -> " << network->path();
+  DetermineEffectiveConfig(network, true);
+}
+
+void ProxyConfigServiceImpl::DetermineEffectiveConfig(
+    const NetworkState* network,
+    bool activate) {
   // Get prefs proxy config if available.
   net::ProxyConfig pref_config;
   ProxyPrefs::ConfigState pref_state = GetProxyConfig(&pref_config);
 
   // Get network proxy config if available.
   net::ProxyConfig network_config;
   net::ProxyConfigService::ConfigAvailability network_availability =
       net::ProxyConfigService::CONFIG_UNSET;
   bool ignore_proxy = activate;
   if (network) {
     // If we're activating proxy, ignore proxy if necessary;
     // otherwise, for ui, get actual proxy to show user.
-    ignore_proxy = activate ? IgnoreProxy(network) : false;
+    ignore_proxy = activate ? IgnoreProxy(*network) : false;
     // If network is shared but use-shared-proxies is off, use direct mode.
     if (ignore_proxy) {
       VLOG(1) << "Shared network && !use-shared-proxies, use direct";
       network_availability = net::ProxyConfigService::CONFIG_VALID;
-    } else if (!network->proxy_config().empty()) {
+    } else if (ParseProxyConfig(*network, &network_config)) {
       // Network is private or shared with user using shared proxies.
-      if (ParseProxyConfig(network, &network_config)) {
-        VLOG(1) << this << ": using network proxy: "
-                << network->proxy_config();
-        network_availability = net::ProxyConfigService::CONFIG_VALID;
-      }
+      VLOG(1) << this << ": using network proxy: "
+              << network->proxy_config();
+      network_availability = net::ProxyConfigService::CONFIG_VALID;
     }
   }
 
   // Determine effective proxy config, either from prefs or network.
   ProxyPrefs::ConfigState effective_config_state;
   net::ProxyConfig effective_config;
   GetEffectiveProxyConfig(pref_state, pref_config,
                           network_availability, network_config, ignore_proxy,
                           &effective_config_state, &effective_config);
 
@@ skipping 17 matching lines @@
       // when PrefProxyConfigTrackerImpl pushes it to ChromeProxyConfigService.
       if (effective_config_state == ProxyPrefs::CONFIG_SYSTEM)
         effective_config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
       // If config is manual, add rule to bypass local host.
       if (effective_config.proxy_rules().type !=
           net::ProxyConfig::ProxyRules::TYPE_NO_RULES)
         effective_config.proxy_rules().bypass_rules.AddRuleToBypassLocal();
       PrefProxyConfigTrackerImpl::OnProxyConfigChanged(effective_config_state,
                                                        effective_config);
       if (VLOG_IS_ON(1) && !update_pending()) {  // Update was successful.
-        scoped_ptr<DictionaryValue> config_dict(static_cast<DictionaryValue*>(
-            effective_config.ToValue()));
-        std::string config_value;
-        JSONStringValueSerializer serializer(&config_value);
-        serializer.Serialize(*config_dict.get());
+        scoped_ptr<base::DictionaryValue> config_dict(
+            effective_config.ToValue());
         VLOG(1) << this << ": Proxy changed: "
                 << ConfigStateToString(active_config_state_)
-                << ", " << config_value;
+                << ", " << *config_dict;
       }
     }
   } else {  // For UI, store effective proxy into |current_ui_config_|.
+    DCHECK(network);
     current_ui_config_.FromNetProxyConfig(effective_config);
     current_ui_config_.state = effective_config_state;
     if (PrefPrecedes(effective_config_state)) {
       current_ui_config_.user_modifiable = false;
-    } else if (!IsNetworkProxySettingsEditable(network)) {
+    } else if (!IsNetworkProxySettingsEditable(*network)) {
       // TODO(xiyuan): Figure out the right way to set config state for managed
       // network.
       current_ui_config_.state = ProxyPrefs::CONFIG_POLICY;
       current_ui_config_.user_modifiable = false;
     } else {
-      current_ui_config_.user_modifiable = !network || !IgnoreProxy(network);
+      current_ui_config_.user_modifiable = !IgnoreProxy(*network);
     }
   }
 }
-
-void ProxyConfigServiceImpl::OnUISetCurrentNetwork(const Network* network) {
-  DetermineEffectiveConfig(network, false);
-  VLOG(1) << "Current ui network: "
-          << (network->name().empty() ? current_ui_network_ : network->name())
-          << ", " << ModeToString(current_ui_config_.mode)
-          << ", " << ConfigStateToString(current_ui_config_.state)
-          << ", modifiable:" << current_ui_config_.user_modifiable;
-  // Notify whoever is interested in this change.
-  std::vector<base::Closure>::iterator iter = callbacks_.begin();
-  while (iter != callbacks_.end()) {
-    if (iter->is_null()) {
-      iter = callbacks_.erase(iter);
-    } else {
-      iter->Run();
-      ++iter;
-    }
-  }
-}
 
 void ProxyConfigServiceImpl::ResetUICache() {
   current_ui_network_.clear();
   current_ui_config_ = ProxyConfig();
 }
 
 void ProxyConfigServiceImpl::FetchProxyPolicy() {
   if (CrosSettingsProvider::TRUSTED !=
       CrosSettings::Get()->PrepareTrustedValues(
           base::Bind(&ProxyConfigServiceImpl::FetchProxyPolicy,
@@ skipping 11 matching lines @@
 
   VLOG(1) << "Retrieved proxy setting from device, value=["
           << policy_value << "]";
   ProxyConfig device_config;
   if (!device_config.DeserializeForDevice(policy_value) ||
       !device_config.SerializeForNetwork(&device_config_)) {
     LOG(WARNING) << "Can't deserialize device setting or serialize for network";
     device_config_.clear();
     return;
   }
-  if (!active_network_.empty()) {
-    VLOG(1) << "Try migrating device config to " << active_network_;
-    SetProxyConfigForNetwork(active_network_, device_config_, true);
+  const NetworkState* default_network =
+      NetworkStateHandler::Get()->DefaultNetwork();
+  if (default_network) {
+    VLOG(1) << "Try migrating device config to " << default_network->path();
+    SetProxyConfigForNetwork(default_network->path(), device_config_, true);
   }
 }
 
 }  // namespace chromeos