Use GUID in captive portal API instead of service path

Also changes the fake implementations and other tests to explicitly specify guids.

BUG=none
For components/wifi/fake_wifi_service.cc:
TBR=mef@chromium.org

Review URL: https://codereview.chromium.org/377063003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282995 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 12 deletions

diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc
index 0dcc68d..1482ec3 100644
--- a/chromeos/network/network_cert_migrator_unittest.cc
+++ b/chromeos/network/network_cert_migrator_unittest.cc
@@ -104,13 +104,19 @@ class NetworkCertMigratorTest : public testing::Test {
     network_cert_migrator_->Init(network_state_handler_.get());
   }
 
+  void AddService(const std::string& network_id,
+                  const std::string& type,
+                  const std::string& state) {
+    service_test_->AddService(network_id /* service_path */,
+                              network_id /* guid */,
+                              network_id /* name */,
+                              type,
+                              state,
+                              true /* add_to_visible */);
+  }
+
   void SetupWifiWithNss() {
-    const bool add_to_visible = true;
-    service_test_->AddService(kWifiStub,
-                              kWifiStub,
-                              shill::kTypeWifi,
-                              shill::kStateOnline,
-                              add_to_visible);
+    AddService(kWifiStub, shill::kTypeWifi, shill::kStateOnline);
     service_test_->SetServiceProperty(kWifiStub,
                                       shill::kEapCaCertNssProperty,
                                       base::StringValue(kNSSNickname));
@@ -131,12 +137,7 @@ class NetworkCertMigratorTest : public testing::Test {
   }
 
   void SetupVpnWithNss(bool open_vpn) {
-    const bool add_to_visible = true;
-    service_test_->AddService(kVPNStub,
-                              kVPNStub,
-                              shill::kTypeVPN,
-                              shill::kStateIdle,
-                              add_to_visible);
+    AddService(kVPNStub, shill::kTypeVPN, shill::kStateIdle);
     base::DictionaryValue provider;
     const char* nss_property = open_vpn ? shill::kOpenVPNCaCertNSSProperty
                                         : shill::kL2tpIpsecCaCertNssProperty;