Use GUID instead of servicePath in network settings

chrome/browser/chromeos/login/ui/proxy_settings_dialog.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/chromeos/login/ui/proxy_settings_dialog.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ skipping 19 matching lines @@
 const float kProxySettingsDialogReasonableHeightRatio = 0.4f;
 
 const char kProxySettingsURLParam[] = "?network=%s";
 
 int CalculateSize(int screen_size, int min_comfortable, float desired_ratio) {
   int desired_size = static_cast<int>(desired_ratio * screen_size);
   desired_size = std::max(min_comfortable, desired_size);
   return std::min(screen_size, desired_size);
 }
 
-GURL GetURLForProxySettings(const std::string& service_path) {
+GURL GetURLForProxySettings(const std::string& guid) {
   std::string url(chrome::kChromeUIProxySettingsURL);
   url += base::StringPrintf(
       kProxySettingsURLParam,
-      net::EscapeUrlEncodedData(service_path, true).c_str());
+      net::EscapeUrlEncodedData(guid, true).c_str());
   return GURL(url);
 }
 
 }  // namespace
 
 namespace chromeos {
 
 // static
 int ProxySettingsDialog::instance_count_ = 0;
 
 ProxySettingsDialog::ProxySettingsDialog(
     content::BrowserContext* browser_context,
     const NetworkState& network,
     LoginWebDialog::Delegate* delegate,
     gfx::NativeWindow window)
     : LoginWebDialog(browser_context,
                      delegate,
                      window,
                      base::string16(),
-                     GetURLForProxySettings(network.path())) {
+                     GetURLForProxySettings(network.guid())) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   ++instance_count_;
 
   gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
   SetDialogSize(CalculateSize(screen_bounds.width(),
                               kProxySettingsDialogReasonableWidth,
                               kProxySettingsDialogReasonableWidthRatio),
                 CalculateSize(screen_bounds.height(),
                               kProxySettingsDialogReasonableHeight,
                               kProxySettingsDialogReasonableHeightRatio));
@@ skipping 19 matching lines @@
     chrome::NOTIFICATION_LOGIN_PROXY_CHANGED,
     content::NotificationService::AllSources(),
     content::NotificationService::NoDetails());
 }
 
 bool ProxySettingsDialog::IsShown() {
   return instance_count_ > 0;
 }
 
 }  // namespace chromeos