Use GUID instead of servicePath in network settings

chrome/browser/chromeos/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 "base/logging.h"
 #include "base/memory/scoped_ptr.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 "components/device_event_log/device_event_log.h"
 #include "net/proxy/proxy_config.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* ModeToString(UIProxyConfig::Mode mode) {
   switch (mode) {
     case UIProxyConfig::MODE_DIRECT:
       return "direct";
@@ skipping 41 matching lines @@
 
 UIProxyConfigService::~UIProxyConfigService() {
 }
 
 void UIProxyConfigService::SetPrefs(PrefService* profile_prefs,
                                     PrefService* local_state_prefs) {
   profile_prefs_ = profile_prefs;
   local_state_prefs_ = local_state_prefs;
 }
 
-void UIProxyConfigService::SetCurrentNetwork(
-    const std::string& current_network) {
-  current_ui_network_ = current_network;
+void UIProxyConfigService::SetCurrentNetworkGuid(
+    const std::string& current_guid) {
+  current_ui_network_guid_ = current_guid;
 }
 
 void UIProxyConfigService::UpdateFromPrefs() {
-  const NetworkState* network = NULL;
-  if (!current_ui_network_.empty()) {
-    network = NetworkHandler::Get()
-                  ->network_state_handler()
-                  ->GetNetworkStateFromServicePath(current_ui_network_,
-                                                   true /* configured_only */);
-    LOG_IF(ERROR, !network) << "Couldn't find NetworkState for network "
-                            << current_ui_network_;
+const NetworkState* network = NULL;

[pneubeck (no reviews), 2015/03/12 20:53:57]

indentation

[stevenjb, 2015/03/13 01:20:14]

Done.

+  if (!current_ui_network_guid_.empty()) {
+    network =
+        NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+            current_ui_network_guid_);
   }
-  if (!network) {
-    current_ui_network_.clear();
+  if (!network || !network->IsInProfile()) {
+    NET_LOG(ERROR) << "No configured NetworkState for guid: "
+                   << current_ui_network_guid_;
+    current_ui_network_guid_.clear();
     current_ui_config_ = UIProxyConfig();
     return;
   }
 
   DetermineEffectiveConfig(*network);
   VLOG(1) << "Current ui network: " << network->name() << ", "
           << ModeToString(current_ui_config_.mode) << ", "
           << ProxyPrefs::ConfigStateToDebugString(current_ui_config_.state)
           << ", modifiable:" << current_ui_config_.user_modifiable;
 }
 
 void UIProxyConfigService::GetProxyConfig(UIProxyConfig* config) const {
   *config = current_ui_config_;
 }
 
 void UIProxyConfigService::SetProxyConfig(const UIProxyConfig& config) {
   current_ui_config_ = config;
-  if (current_ui_network_.empty())
+  if (current_ui_network_guid_.empty())
     return;
 
   const NetworkState* network =
-      NetworkHandler::Get()
-          ->network_state_handler()
-          ->GetNetworkStateFromServicePath(current_ui_network_,
-                                           true /* configured_only */);
-  if (!network) {
-    LOG(ERROR) << "Couldn't find NetworkState for network "
-               << current_ui_network_;
+      NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
+          current_ui_network_guid_);
+  if (!network || !network->IsInProfile()) {
+    NET_LOG(ERROR) << "No configured NetworkState for guid: "
+                   << current_ui_network_guid_;
     return;
   }
 
   // Store config for this network.
   scoped_ptr<base::DictionaryValue> proxy_config_value(
       config.ToPrefProxyConfig());
   ProxyConfigDictionary proxy_config_dict(proxy_config_value.get());
 
-  VLOG(1) << "Set proxy for " << current_ui_network_
+  VLOG(1) << "Set proxy for " << current_ui_network_guid_
           << " to " << *proxy_config_value;
 
   proxy_config::SetProxyConfigForNetwork(proxy_config_dict, *network);
   current_ui_config_.state = ProxyPrefs::CONFIG_SYSTEM;
 }
 
 void UIProxyConfigService::DetermineEffectiveConfig(
     const NetworkState& network) {
   DCHECK(local_state_prefs_);
 
@@ skipping 38 matching lines @@
   } 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