[Media Router] Support dual discovery

chrome/common/media_router/discovery/media_sink_internal.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_COMMON_MEDIA_ROUTER_DISCOVERY_MEDIA_SINK_INTERNAL_H_
 #define CHROME_COMMON_MEDIA_ROUTER_DISCOVERY_MEDIA_SINK_INTERNAL_H_
 
 #include <utility>
 
 #include "base/memory/manual_constructor.h"
@@ skipping 17 matching lines @@
   DialSinkExtraData(const DialSinkExtraData& other);
   ~DialSinkExtraData();
 
   bool operator==(const DialSinkExtraData& other) const;
 };
 
 // Extra data for Cast media sink.
 struct CastSinkExtraData {
   net::IPAddress ip_address;
 
+  int port = 0;
+
   // Model name of the sink.
   std::string model_name;
 
   // A bit vector representing the capabilities of the sink. The values are
   // defined in media_router.mojom.
   uint8_t capabilities = 0;
 
   // ID of Cast channel opened for the sink. The caller must set this value to a
   // valid cast_channel_id. The cast_channel_id may change over time as the
   // 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();
 
   bool operator==(const CastSinkExtraData& other) const;
 };
 
 // Represents a media sink discovered by MediaSinkService. It is used by
 // MediaSinkService to push MediaSinks with extra data to the
 // MediaRouteProvider, and it is not exposed to users of MediaRouter.
 class MediaSinkInternal {
  public:
   // Used by mojo.
   MediaSinkInternal();

[imcheng, 2017/07/12 00:51:36]

You'll need to implement move constructor and the move assignment operator in
order to support std::move, otherwise std::move has no effect. You will also
need to make sure all of the members support std::move as well.

 
   // Used by MediaSinkService to create media sinks.
   MediaSinkInternal(const MediaSink& sink, const DialSinkExtraData& dial_data);
   MediaSinkInternal(const MediaSink& sink, const CastSinkExtraData& cast_data);
 
   // Used to push instance of this class into vector.
   MediaSinkInternal(const MediaSinkInternal& other);
 
   ~MediaSinkInternal();
 
@@ skipping 48 matching lines @@
     base::ManualConstructor<DialSinkExtraData> dial_data_;
 
     // Set if sink is Cast sink.
     base::ManualConstructor<CastSinkExtraData> cast_data_;
   };
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_COMMON_MEDIA_ROUTER_DISCOVERY_MEDIA_SINK_INTERNAL_H_