[Media Router] Add DialMediaSinkService and DeviceDescriptionService

chrome/browser/media/router/media_sink_service.h

Index: chrome/browser/media/router/media_sink_service.h
diff --git a/chrome/browser/media/router/media_sink_service.h b/chrome/browser/media/router/media_sink_service.h
index ed433b2228924d35a6f76603acbb7a3cca6acdf8..1492802e6fd84ae1bbbc04167d5659eb74c0e9c0 100644
--- a/chrome/browser/media/router/media_sink_service.h
+++ b/chrome/browser/media/router/media_sink_service.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "chrome/browser/media/router/media_sink.h"
+#include "chrome/browser/media/router/discovery/media_sink_internal.h"
 
 namespace media_router {
 
@@ -25,10 +25,10 @@ class MediaSinkService {
   // Callback to be invoked when this class finishes sink discovering.
   // Arg 0: Sinks discovered and resolved by the service.
   using OnSinksDiscoveredCallback =
-      base::Callback<void(const std::vector<MediaSink>&)>;
+      base::Callback<void(const std::vector<MediaSinkInternal>&)>;

[mark a. foltz, 2017/04/18 18:16:27]

So I thought that MediaSink would remain the public API the Media Router used to
expose sinks to the rest of the browser, and MediaSinkInternal was for passing
around the discovery code. Why was this changed here?

[zhaobin, 2017/04/21 23:12:59]

This callback is used to pass MediaSinks from MR to MRP. Need to be
MediaSinkInternal which contains DialMediaSinklExtraData.

 
   explicit MediaSinkService(
-      const OnSinksDiscoveredCallback& sinks_discovered_callback);
+      const OnSinksDiscoveredCallback& sink_discovery_callback);
 
   virtual ~MediaSinkService();
 
@@ -48,7 +48,7 @@ class MediaSinkService {
   virtual void RemoveSinkQuery(MediaSinksObserver* observer) = 0;
 
  protected:
-  OnSinksDiscoveredCallback sinks_discovered_callback_;
+  OnSinksDiscoveredCallback sink_discovery_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSinkService);
 };