[Media Router] Support dual discovery

chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h

 // Copyright 2017 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_DISCOVERY_DIAL_DIAL_MEDIA_SINK_SERVICE_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DIAL_DIAL_MEDIA_SINK_SERVICE_IMPL_H_
 
 #include <memory>
 #include <set>
 
 #include "chrome/browser/media/router/discovery/dial/device_description_service.h"
 #include "chrome/browser/media/router/discovery/dial/dial_registry.h"
 #include "chrome/browser/media/router/discovery/media_sink_service_base.h"
 #include "chrome/browser/media/router/media_router_metrics.h"
 
 namespace media_router {
 
+class CastMediaSinkService;
 class DeviceDescriptionService;
 class DialRegistry;
 
 // A service which can be used to start background discovery and resolution of
 // DIAL devices (Smart TVs, Game Consoles, etc.).
 // This class is not thread safe. All methods must be called from the IO thread.
 class DialMediaSinkServiceImpl : public MediaSinkServiceBase,
                                  public DialRegistry::Observer {
  public:
-  DialMediaSinkServiceImpl(const OnSinksDiscoveredCallback& callback,
-                           net::URLRequestContextGetter* request_context);
+  DialMediaSinkServiceImpl(
+      const OnSinksDiscoveredCallback& callback,
+      scoped_refptr<CastMediaSinkService> cast_media_sink_service,

[mark a. foltz, 2017/07/11 23:52:51]

Since the CMSS is optional for the DialMediaSinkService to function, I would
prefer that it be passed through a setter on the DMSS.
This would remove the need to pass nullptr in the unit tests.

+      net::URLRequestContextGetter* request_context);
   ~DialMediaSinkServiceImpl() override;
 
   // MediaSinkService implementation
   void Start() override;
   void Stop() override;
 
  protected:
   // Returns instance of device description service. Create a new one if none
   // exists.
   DeviceDescriptionService* GetDescriptionService();
@@ skipping 32 matching lines @@
 
   // Raw pointer to DialRegistry singleton.
   DialRegistry* dial_registry_ = nullptr;
 
   // DialRegistry for unit test.
   DialRegistry* test_dial_registry_ = nullptr;
 
   // Device data list from current round of discovery.
   DialRegistry::DeviceList current_devices_;
 
+  scoped_refptr<CastMediaSinkService> cast_media_sink_service_;
+
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 
   MediaRouterMetrics metrics_;
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DIAL_DIAL_MEDIA_SINK_SERVICE_IMPL_H_