Invoke createNetwork() callback with GUID, not service name

chromeos/network/network_configuration_handler_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 55 matching lines @@
 
 void ErrorCallback(bool error_expected,
                    const std::string& expected_id,
                    const std::string& error_name,
                    scoped_ptr<base::DictionaryValue> error_data) {
   EXPECT_TRUE(error_expected) << "Unexpected error: " << error_name
                               << " with associated data: \n"
                               << PrettyJson(*error_data);
 }
 
-void StringResultCallback(const std::string& expected_result,
-                          const std::string& result) {
-  EXPECT_EQ(expected_result, result);
+void ServiceResultCallback(const std::string& expected_result,
+                           const std::string& service_path,
+                           const std::string& guid) {
+  EXPECT_EQ(expected_result, service_path);
 }
 
 void DBusErrorCallback(const std::string& error_name,
                        const std::string& error_message) {
   EXPECT_TRUE(false) << "DBus Error: " << error_name << "(" << error_message
                      << ")";
 }
 
 class TestCallback {
  public:
@@ skipping 190 matching lines @@
 
   bool PendingProfileEntryDeleterForTest(const std::string& service_path) {
     return network_configuration_handler_->PendingProfileEntryDeleterForTest(
         service_path);
   }
 
   void CreateConfiguration(const std::string& service_path,
                            const base::DictionaryValue& properties) {
     network_configuration_handler_->CreateShillConfiguration(
         properties, NetworkConfigurationObserver::SOURCE_USER_ACTION,
-        base::Bind(&StringResultCallback, service_path),
+        base::Bind(&ServiceResultCallback, service_path),
         base::Bind(&ErrorCallback, false, std::string()));
   }
 
  protected:
   MockShillManagerClient* mock_manager_client_;
   MockShillProfileClient* mock_profile_client_;
   MockShillServiceClient* mock_service_client_;
   scoped_ptr<NetworkStateHandler> network_state_handler_;
   scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
   base::MessageLoopForUI message_loop_;
@@ skipping 218 matching lines @@
   void SuccessCallback(const std::string& callback_name) {
     success_callback_name_ = callback_name;
   }
 
   void GetPropertiesCallback(const std::string& service_path,
                              const base::DictionaryValue& dictionary) {
     get_properties_path_ = service_path;
     get_properties_.reset(dictionary.DeepCopy());
   }
 
-  void CreateConfigurationCallback(const std::string& service_path) {
+  void CreateConfigurationCallback(const std::string& service_path,
+                                   const std::string& guid) {
     create_service_path_ = service_path;
   }
 
   void CreateTestConfiguration(const std::string& service_path,
                                const std::string& type) {
     base::DictionaryValue properties;
     shill_property_util::SetSSID(service_path, &properties);
     properties.SetStringWithoutPathExpansion(shill::kNameProperty,
                                              service_path);
     properties.SetStringWithoutPathExpansion(shill::kGuidProperty,
@@ skipping 204 matching lines @@
   EXPECT_FALSE(test_observer->HasConfiguration(service_path));
   EXPECT_FALSE(test_observer->HasConfigurationInProfile(
       service_path, NetworkProfileHandler::GetSharedProfilePath()));
   EXPECT_FALSE(
       test_observer->HasConfigurationInProfile(service_path, user_profile));
 
   network_configuration_handler_->RemoveObserver(test_observer.get());
 }
 
 }  // namespace chromeos