[Media Router] Support dual discovery

chrome/common/media_router/discovery/media_sink_internal.h

Index: chrome/common/media_router/discovery/media_sink_internal.h
diff --git a/chrome/common/media_router/discovery/media_sink_internal.h b/chrome/common/media_router/discovery/media_sink_internal.h
index 25d7b617e0f18c79922be432c602358895d13386..1884edf302df69d2115b9d299f27708ffd458b5a 100644
--- a/chrome/common/media_router/discovery/media_sink_internal.h
+++ b/chrome/common/media_router/discovery/media_sink_internal.h
@@ -35,6 +35,8 @@ struct DialSinkExtraData {
 struct CastSinkExtraData {
   net::IPAddress ip_address;
 
+  int port = 0;
+
   // Model name of the sink.
   std::string model_name;
 
@@ -47,6 +49,9 @@ struct CastSinkExtraData {
   // browser reconnects to a device.
   int cast_channel_id = 0;
 
+  // True if Cast channel is opened from DIAL sink.
+  bool discovered_by_dial = false;
+
   CastSinkExtraData();
   CastSinkExtraData(const CastSinkExtraData& other);
   ~CastSinkExtraData();
@@ -68,10 +73,13 @@ class MediaSinkInternal {
 
   // Used to push instance of this class into vector.
   MediaSinkInternal(const MediaSinkInternal& other);
+  MediaSinkInternal(MediaSinkInternal&& other);
 
   ~MediaSinkInternal();
 
   MediaSinkInternal& operator=(const MediaSinkInternal& other);
+  MediaSinkInternal& operator=(MediaSinkInternal&& other);
+
   bool operator==(const MediaSinkInternal& other) const;
   bool operator!=(const MediaSinkInternal& other) const;
   // Sorted by sink id.
@@ -109,6 +117,7 @@ class MediaSinkInternal {
  private:
   void InternalCopyAssignFrom(const MediaSinkInternal& other);
   void InternalCopyConstructFrom(const MediaSinkInternal& other);
+  void InternalMoveConstructFrom(MediaSinkInternal&& other);
   void InternalCleanup();
 
   enum class SinkType { GENERIC, DIAL, CAST };