Use GUID instead of servicePath in network settings

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 001bb6dd3fef611c810f37fc17298506e26fd953..a5e5cc4bd3909d56caeb4d25ea29bdd84f38176a 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -174,13 +174,6 @@ void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
       ProfileManager::GetActiveUserProfile(), sub_page);
 }
 
-void ShowNetworkSettingsPage(const std::string& service_path) {
-  std::string page = chrome::kInternetOptionsSubPage;
-  page += "?servicePath=" + net::EscapeUrlEncodedData(service_path, true);
-  content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
-  ShowSettingsSubPageForActiveUser(page);
-}
-
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
@@ -453,15 +446,19 @@ void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
   SetTimeDialog::ShowDialog(GetNativeWindow());
 }
 
-void SystemTrayDelegateChromeOS::ShowNetworkSettings(
-    const std::string& service_path) {
+void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
+    const std::string& guid) {
   bool userAddingRunning = ash::Shell::GetInstance()
                                ->session_state_delegate()
                                ->IsInSecondaryLoginScreen();
 
   if (!LoginState::Get()->IsUserLoggedIn() || userAddingRunning)
     return;
-  ShowNetworkSettingsPage(service_path);
+  std::string page = chrome::kInternetOptionsSubPage;
+  if (!guid.empty())
+    page += "?guid=" + net::EscapeUrlEncodedData(guid, true);
+  content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
+  ShowSettingsSubPageForActiveUser(page);
 }
 
 void SystemTrayDelegateChromeOS::ShowBluetoothSettings() {