[Media Router] Use DialMediaSinkService in MediaRouterMojoImpl

chrome/browser/media/router/mojo/media_router_mojo_impl.h

 // Copyright 2015 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_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
+#include "base/feature_list.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/optional.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/media/router/issue_manager.h"
 #include "chrome/browser/media/router/media_router_base.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/common/media_router/issue.h"
 #include "chrome/common/media_router/mojo/media_router.mojom.h"
 #include "chrome/common/media_router/route_request_result.h"
+#include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 class EventPageTracker;
 class Extension;
 }
 
+namespace net {
+class URLRequestContextGetter;
+}
+
 namespace media_router {
 
+extern const base::Feature kEnableDialLocalDiscovery;

[mark a. foltz, 2017/05/01 20:32:57]

Can these go in media_router_feature.cc and exposed through an API in
media_router_feature.h?

[zhaobin, 2017/05/03 01:53:59]

Done.

+extern const base::Feature kEnableCastDiscovery;

[mark a. foltz, 2017/05/01 20:32:57]

Is it okay to do static initialization of base::Feature?

[zhaobin, 2017/05/03 01:54:00]

Code removed. Seems fine.
https://cs.chromium.org/chromium/src/chrome/common/chrome_features.cc?type=cs

+
 enum class MediaRouteProviderWakeReason;
+class DialMediaSinkService;
 
 // MediaRouter implementation that delegates calls to the component extension.
 // Also handles the suspension and wakeup of the component extension.
 // Lives on the UI thread.
 class MediaRouterMojoImpl : public MediaRouterBase,
                             public mojom::MediaRouter {
  public:
   ~MediaRouterMojoImpl() override;
 
   // Sets up the MediaRouterMojoImpl instance owned by |context| to handle
@@ skipping 151 matching lines @@
     std::vector<std::string> joinable_route_ids;
 
     base::ObserverList<MediaRoutesObserver> observers;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(MediaRoutesQuery);
   };
 
   // Standard constructor, used by
   // MediaRouterMojoImplFactory::GetApiForBrowserContext.
-  explicit MediaRouterMojoImpl(
-      extensions::EventPageTracker* event_page_tracker);
+  explicit MediaRouterMojoImpl(extensions::EventPageTracker* event_page_tracker,
+                               content::BrowserContext* context);
 
   // Binds |this| to a Mojo interface request, so that clients can acquire a
   // handle to a MediaRouterMojoImpl instance via the Mojo service connector.
   // Stores the ID of |extension| in |media_route_provider_extension_id_|.
   void BindToMojoRequest(
       mojo::InterfaceRequest<mojom::MediaRouter> request,
       const extensions::Extension& extension);
 
   // Enqueues a closure for later execution by ExecutePendingRequests().
   void EnqueueTask(base::OnceClosure closure);
@@ skipping 153 matching lines @@
   // period.
   void EnsureMdnsDiscoveryEnabled();
   void DoEnsureMdnsDiscoveryEnabled();
 
   // Callback used to enabled mDNS in the MRPM if a firewall prompt will not be
   // triggered. If a firewall prompt would be triggered, enabling mDNS won't
   // happen until the user is clearly interacting with MR.
   void OnFirewallCheckComplete(bool firewall_can_use_local_ports);
 #endif
 
+  // Start browser side sink discovery.
+  void StartBrowserSideDiscovery(net::URLRequestContextGetter* request_context);

[mark a. foltz, 2017/05/01 20:32:57]

Just StartDiscovery()?  Since this is running in the MR it must be running in
the current (browser) process.

[zhaobin, 2017/05/03 01:53:59]

Done.

+
+  // Invoked when browser side sink disocvery finished.

[mark a. foltz, 2017/05/01 20:32:57]

Typo in discovery

[zhaobin, 2017/05/03 01:53:59]

Done.

+  void OnDialMediaSinkDiscovered(const std::vector<MediaSinkInternal>& sinks);
+
   // Requests MRPM to update media sinks.  This allows MRPs that only do
   // discovery on sink queries an opportunity to update discovery results
   // even if the MRP SinkAvailability is marked UNAVAILABLE.
   void UpdateMediaSinks(const MediaSource::Id& source_id);
   void DoUpdateMediaSinks(const MediaSource::Id& source_id);
 
   // Invalidates and removes controllers from |route_controllers_| whose media
   // routes do not appear in |routes|.
   void RemoveInvalidRouteControllers(const std::vector<MediaRoute>& routes);
 
@@ skipping 50 matching lines @@
   MediaRouteProviderWakeReason current_wake_reason_;
 
   // A flag to ensure that we record the provider version once, during the
   // initial event page wakeup attempt.
   bool provider_version_was_recorded_ = false;
 
   // Stores route controllers that can be used to send media commands to the
   // extension.
   std::unordered_map<MediaRoute::Id, MediaRouteController*> route_controllers_;
 
+  // Media sink service for DIAL devices.
+  std::unique_ptr<DialMediaSinkService,
+                  content::BrowserThread::DeleteOnIOThread>

[mark a. foltz, 2017/05/01 20:32:57]

There could be a shutdown race condition here - this assumes the IO thread is
still alive at the time the MediaRouter keyed service is destroyed.  Not a huge
deal, but this dtor may DCHECK if there is no IO thread to post the task to.

[zhaobin, 2017/05/03 01:53:59]

Per discussion with Derek, we are going to make DialMediaSinkService a
refcounted thread safe class DeleteOnIOThread.

+      dial_media_sink_service_;
+
+  content::BrowserContext* context_;
+
 #if defined(OS_WIN)
   // A pair of flags to ensure that mDNS discovery is only enabled on Windows
   // when there will be appropriate context for the user to associate a firewall
   // prompt with Media Router. |should_enable_mdns_discovery_| can only go from
   // |false| to |true|. On Windows, |is_mdns_enabled_| is set to |false| in
   // RegisterMediaRouteProvider and only set to |true| when we successfully call
   // the extension to enable mDNS.
   bool is_mdns_enabled_ = false;
   bool should_enable_mdns_discovery_ = false;
 #endif
 
   base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_