Use GUID instead of ServicePath in networkingPrivate API

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"
@@ skipping 63 matching lines @@
 }
 
 void UIProxyConfigService::SetCurrentNetwork(
     const std::string& current_network) {
   current_ui_network_ = current_network;
 }
 
 void UIProxyConfigService::UpdateFromPrefs() {
   const FavoriteState* network = NULL;
   if (!current_ui_network_.empty()) {
-    network = NetworkHandler::Get()->network_state_handler()->GetFavoriteState(
-        current_ui_network_);
+    network = NetworkHandler::Get()
+                  ->network_state_handler()
+                  ->GetFavoriteStateFromServicePath(current_ui_network_,
+                                                    true /* configured_only */);
     LOG_IF(ERROR, !network) << "Couldn't find FavoriteState for network "
                             << current_ui_network_;
   }
   if (!network) {
     current_ui_network_.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())
     return;
 
   const FavoriteState* network =
-      NetworkHandler::Get()->network_state_handler()->GetFavoriteState(
-          current_ui_network_);
+      NetworkHandler::Get()
+          ->network_state_handler()
+          ->GetFavoriteStateFromServicePath(current_ui_network_,
+                                            true /* configured_only */);
   if (!network) {
     LOG(ERROR) << "Couldn't find FavoriteState for network "
                << current_ui_network_;
     return;
   }
 
   // Store config for this network.
   scoped_ptr<base::DictionaryValue> proxy_config_value(
       config.ToPrefProxyConfig());
   ProxyConfigDictionary proxy_config_dict(proxy_config_value.get());
@@ skipping 50 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