Add DiscoveryNetworkMonitor implementation

chrome/browser/extensions/api/dial/dial_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
 #include "chrome/browser/extensions/api/dial/dial_registry.h"
+#include "chrome/browser/media/router/discovery/discovery_network_monitor.h"
 #include "chrome/common/extensions/api/dial.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "extensions/browser/api/async_api_function.h"
 #include "extensions/browser/event_router.h"
 
 namespace extensions {
 
 namespace api {
 namespace dial {
 class DeviceDescriptionFetcher;
@@ skipping 16 matching lines @@
 // here.  This would also allow a straightforward GetDeviceList implementation
 // (crbug.com/576817), cleanup some long-tail crashes (crbug.com/640011) that
 // are likely due to lifetime issues, and simplify unit tests
 // (crbug.com/661457).
 //
 // Also, DialRegistry should be an interface that can be mocked and injected for
 // tests; this would allow us to remove code that injects test data into the
 // real DialRegsitry.
 class DialAPI : public RefcountedKeyedService,
                 public EventRouter::Observer,
-                public api::dial::DialRegistry::Observer {
+                public api::dial::DialRegistry::Observer,
+                public DiscoveryNetworkMonitor::Observer {

[mark a. foltz, 2017/04/26 22:25:11]

I'd put the extensions API changes in a separate patch for review by one of the
extensions OWNERs.

[btolsch, 2017/05/03 22:03:09]

Done.

  public:
   explicit DialAPI(Profile* profile);
 
   // The DialRegistry for the API. This must always be used only from the IO
   // thread.
   api::dial::DialRegistry* dial_registry();
 
   // Called by the DialRegistry on the IO thread so that the DialAPI dispatches
   // the event to listeners on the UI thread.
   void SendEventOnUIThread(const api::dial::DialRegistry::DeviceList& devices);
@@ skipping 14 matching lines @@
 
   // EventRouter::Observer:
   void OnListenerAdded(const EventListenerInfo& details) override;
   void OnListenerRemoved(const EventListenerInfo& details) override;
 
   // DialRegistry::Observer:
   void OnDialDeviceEvent(
       const api::dial::DialRegistry::DeviceList& devices) override;
   void OnDialError(api::dial::DialRegistry::DialErrorCode type) override;
 
+  // DiscoveryNetworkMonitor::Observer:
+  void OnNetworksChanged(const DiscoveryNetworkMonitor& manager) override;
+
+  void SendNetworkIdChangedOnUIThread(const std::string& network_id);
+
+  void NetworkIdListenerAddedOnIOThread();
+  void NetworkIdListenerRemovedOnIOThread();
+
   // Methods to notify the DialRegistry on the correct thread of new/removed
   // listeners.
   void NotifyListenerAddedOnIOThread();
   void NotifyListenerRemovedOnIOThread();
 
   Profile* profile_;
 
   // Created lazily on first access on the IO thread.
   std::unique_ptr<api::dial::DialRegistry> dial_registry_;
 
@@ skipping 56 matching lines @@
 
   std::unique_ptr<api::dial::FetchDeviceDescription::Params> params_;
   std::unique_ptr<api::dial::DeviceDescriptionFetcher>
       device_description_fetcher_;
 
   DialAPI* dial_;
 
   DISALLOW_COPY_AND_ASSIGN(DialFetchDeviceDescriptionFunction);
 };
 
+class DialGetNetworkIdFunction : public AsyncExtensionFunction {
+ public:
+  DialGetNetworkIdFunction();
+
+ protected:
+  ~DialGetNetworkIdFunction() override;
+
+  // AsyncExtensionFunction:
+  bool RunAsync() override;
+
+ private:
+  DECLARE_EXTENSION_FUNCTION("dial.getNetworkId", DIAL_GETNETWORKID)
+
+  void GetNetworkIdOnIOThread();
+  void NetworkInfoReadyCallback();

[mark a. foltz, 2017/04/26 22:25:11]

OnNetworkInfoReady

[btolsch, 2017/05/03 22:03:09]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(DialGetNetworkIdFunction);
+};
+
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_API_H_