Invoke createNetwork() callback with GUID, not service name

ui/chromeos/network/network_connect.cc

 // Copyright (c) 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 "ui/chromeos/network/network_connect.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 81 matching lines @@
   void OnConnectSucceeded(const std::string& service_path);
   void CallConnectToNetwork(const std::string& service_path,
                             bool check_error_state);
   void OnActivateFailed(const std::string& service_path,
                         const std::string& error_name,
                         scoped_ptr<base::DictionaryValue> error_data);
   void OnActivateSucceeded(const std::string& service_path);
   void OnConfigureFailed(const std::string& error_name,
                          scoped_ptr<base::DictionaryValue> error_data);
   void OnConfigureSucceeded(bool connect_on_configure,
-                            const std::string& service_path);
+                            const std::string& service_path,
+                            const std::string& guid);
   void CallCreateConfiguration(base::DictionaryValue* properties,
                                bool shared,
                                bool connect_on_configure);
   void SetPropertiesFailed(const std::string& desc,
                            const std::string& service_path,
                            const std::string& config_error_name,
                            scoped_ptr<base::DictionaryValue> error_data);
   void SetPropertiesToClear(base::DictionaryValue* properties_to_set,
                             std::vector<std::string>* properties_to_clear);
   void ClearPropertiesAndConnect(
@@ skipping 164 matching lines @@
 
 void NetworkConnectImpl::OnConfigureFailed(
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Unable to configure network", "");
   network_state_notifier_->ShowNetworkConnectError(
       NetworkConnectionHandler::kErrorConfigureFailed, "");
 }
 
 void NetworkConnectImpl::OnConfigureSucceeded(bool connect_on_configure,
-                                              const std::string& service_path) {
+                                              const std::string& service_path,
+                                              const std::string& guid) {
   NET_LOG_USER("Configure Succeeded", service_path);
   if (!connect_on_configure)
     return;
   // After configuring a network, ignore any (possibly stale) error state.
   const bool check_error_state = false;
   CallConnectToNetwork(service_path, check_error_state);
 }
 
 void NetworkConnectImpl::CallCreateConfiguration(
     base::DictionaryValue* shill_properties,
@@ skipping 350 matching lines @@
   return g_network_connect;
 }
 
 NetworkConnect::NetworkConnect() {
 }
 
 NetworkConnect::~NetworkConnect() {
 }
 
 }  // namespace ui