Invoke createNetwork() callback with GUID, not service name

extensions/browser/api/networking_private/networking_private_delegate.h

 // Copyright 2014 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.
 
 #ifndef EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_DELEGATE_H_
 #define EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 // Base class for platform dependent networkingPrivate API implementations.
 // All inputs and results for this class use ONC values. See
 // networking_private.idl for descriptions of the expected inputs and results.
 class NetworkingPrivateDelegate : public KeyedService {
  public:
   using DictionaryCallback =
       base::Callback<void(scoped_ptr<base::DictionaryValue>)>;
   using VoidCallback = base::Callback<void()>;
   using BoolCallback = base::Callback<void(bool)>;
   using StringCallback = base::Callback<void(const std::string&)>;
+  using ServiceCallback =
+      base::Callback<void(const std::string&, const std::string&)>;

[stevenjb, 2016/03/10 01:49:10]

'ServiceCallback' isn't very meaningful in this context, plus I think we can get
away with just using 'guid' here. See my comment in
NetworkingPrivateChromeOS::CreateNetwork.

[Kevin Cernekee, 2016/03/11 01:53:57]

Done.

   using NetworkListCallback = base::Callback<void(scoped_ptr<base::ListValue>)>;
   using FailureCallback = base::Callback<void(const std::string&)>;
   using DeviceStateList =
       std::vector<scoped_ptr<api::networking_private::DeviceStateProperties>>;
   using VerificationProperties =
       api::networking_private::VerificationProperties;
 
   // The Verify* methods will be forwarded to a delegate implementation if
   // provided, otherwise they will fail. A separate delegate it used so that the
   // current Verify* implementations are not exposed outside of src/chrome.
   class VerifyDelegate {
    public:
     typedef NetworkingPrivateDelegate::VerificationProperties
         VerificationProperties;
     typedef NetworkingPrivateDelegate::BoolCallback BoolCallback;
     typedef NetworkingPrivateDelegate::StringCallback StringCallback;
+    typedef NetworkingPrivateDelegate::ServiceCallback ServiceCallback;
     typedef NetworkingPrivateDelegate::FailureCallback FailureCallback;
 
     VerifyDelegate();
     virtual ~VerifyDelegate();
 
     virtual void VerifyDestination(
         const VerificationProperties& verification_properties,
         const BoolCallback& success_callback,
         const FailureCallback& failure_callback) = 0;
     virtual void VerifyAndEncryptCredentials(
@@ skipping 52 matching lines @@
       const FailureCallback& failure_callback) = 0;
   virtual void GetState(const std::string& guid,
                         const DictionaryCallback& success_callback,
                         const FailureCallback& failure_callback) = 0;
   virtual void SetProperties(const std::string& guid,
                              scoped_ptr<base::DictionaryValue> properties,
                              const VoidCallback& success_callback,
                              const FailureCallback& failure_callback) = 0;
   virtual void CreateNetwork(bool shared,
                              scoped_ptr<base::DictionaryValue> properties,
-                             const StringCallback& success_callback,
+                             const ServiceCallback& success_callback,
                              const FailureCallback& failure_callback) = 0;
   virtual void ForgetNetwork(const std::string& guid,
                              const VoidCallback& success_callback,
                              const FailureCallback& failure_callback) = 0;
   virtual void GetNetworks(const std::string& network_type,
                            bool configured_only,
                            bool visible_only,
                            int limit,
                            const NetworkListCallback& success_callback,
                            const FailureCallback& failure_callback) = 0;
@@ skipping 76 matching lines @@
 
   // Interface for UI methods. May be null.
   scoped_ptr<UIDelegate> ui_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateDelegate);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_DELEGATE_H_