Invoke createNetwork() callback with GUID, not service name

chromeos/network/network_configuration_handler.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 "chromeos/network/network_configuration_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 261 matching lines @@
       dbus::ObjectPath(service_path), names,
       base::Bind(&NetworkConfigurationHandler::ClearPropertiesSuccessCallback,
                  AsWeakPtr(), service_path, names, callback),
       base::Bind(&NetworkConfigurationHandler::ClearPropertiesErrorCallback,
                  AsWeakPtr(), service_path, error_callback));
 }
 
 void NetworkConfigurationHandler::CreateShillConfiguration(
     const base::DictionaryValue& shill_properties,
     NetworkConfigurationObserver::Source source,
-    const network_handler::StringResultCallback& callback,
+    const network_handler::ServiceResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) {
   ShillManagerClient* manager =
       DBusThreadManager::Get()->GetShillManagerClient();
   std::string type;
   shill_properties.GetStringWithoutPathExpansion(shill::kTypeProperty, &type);
   DCHECK(!type.empty());
 
   std::string network_id =
       shill_property_util::GetNetworkIdFromProperties(shill_properties);
 
@@ skipping 93 matching lines @@
     NetworkStateHandler* network_state_handler,
     NetworkDeviceHandler* network_device_handler) {
   network_state_handler_ = network_state_handler;
   network_device_handler_ = network_device_handler;
 }
 
 void NetworkConfigurationHandler::RunCreateNetworkCallback(
     const std::string& profile_path,
     NetworkConfigurationObserver::Source source,
     scoped_ptr<base::DictionaryValue> configure_properties,
-    const network_handler::StringResultCallback& callback,
+    const network_handler::ServiceResultCallback& callback,
     const dbus::ObjectPath& service_path) {
-  if (!callback.is_null())
-    callback.Run(service_path.value());
+  if (!callback.is_null()) {
+    std::string guid;
+    configure_properties->GetStringWithoutPathExpansion(
+        ::onc::network_config::kGUID, &guid);
+    DCHECK(!guid.empty());
+    callback.Run(service_path.value(), guid);
+  }
   FOR_EACH_OBSERVER(NetworkConfigurationObserver, observers_,
                     OnConfigurationCreated(service_path.value(), profile_path,
                                            *configure_properties, source));
   // This may also get called when CreateConfiguration is used to update an
   // existing configuration, so request a service update just in case.
   // TODO(pneubeck): Separate 'Create' and 'Update' calls and only trigger
   // this on an update.
   network_state_handler_->RequestUpdateForNetwork(service_path.value());
 }
 
@@ skipping 147 matching lines @@
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
     NetworkStateHandler* network_state_handler,
     NetworkDeviceHandler* network_device_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
   handler->Init(network_state_handler, network_device_handler);
   return handler;
 }
 
 }  // namespace chromeos