NetworkingPrivate API events should supply list of GUIDs, not service paths

chrome/browser/extensions/api/networking_private/networking_private_apitest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/users/user.h"
@@ skipping 219 matching lines @@
     content::RunAllPendingInMessageLoop();
   }
 
   void AddService(const std::string& service_path,
                   const std::string& name,
                   const std::string& type,
                   const std::string& state) {
     const bool add_to_visible = true;
     // Tests need a known GUID, so use 'service_path'.
     service_test_->AddServiceWithIPConfig(
-        service_path, service_path /* guid */, name,
+        service_path, service_path + "_GUID" /* guid */, name,
         type, state, "" /* ipconfig_path */,
         add_to_visible);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     detector_ = new NetworkPortalDetectorTestImpl();
     NetworkPortalDetector::InitializeForTesting(detector_);
 
     ExtensionApiTest::SetUpOnMainThread();
     content::RunAllPendingInMessageLoop();
@@ skipping 69 matching lines @@
     service_test_->SetServiceProperty("stub_wifi1",
                                       shill::kWifiFrequencyListProperty,
                                       frequencies1);
     service_test_->SetServiceProperty("stub_wifi1",
                                       shill::kWifiFrequency,
                                       base::FundamentalValue(2400));
 
     AddService("stub_wifi2", "wifi2_PSK", shill::kTypeWifi, shill::kStateIdle);
     service_test_->SetServiceProperty("stub_wifi2",
                                       shill::kGuidProperty,
-                                      base::StringValue("stub_wifi2"));
+                                      base::StringValue("stub_wifi2_GUID"));
     service_test_->SetServiceProperty("stub_wifi2",
                                       shill::kSecurityProperty,
                                       base::StringValue(shill::kSecurityPsk));
     service_test_->SetServiceProperty("stub_wifi2",
                                       shill::kSignalStrengthProperty,
                                       base::FundamentalValue(80));
     service_test_->SetServiceProperty("stub_wifi2",
                                       shill::kConnectableProperty,
                                       base::FundamentalValue(true));
 
@@ skipping 262 matching lines @@
 
   state.status =
       NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED;
   detector()->SetDetectionResultsForTesting("stub_cellular1", state);
 
   EXPECT_TRUE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest,
                        CaptivePortalNotification) {
-  detector()->SetDefaultNetworkPathForTesting("wifi");
+  detector()->SetDefaultNetworkPathForTesting("wifi", "wifi_GUID");
   NetworkPortalDetector::CaptivePortalState state;
   state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
   detector()->SetDetectionResultsForTesting("wifi", state);
 
   TestListener listener(
       "notifyPortalDetectorObservers",
       base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting,
                  base::Unretained(detector())));
   EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_;
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace