[Media Router] Support dual discovery

chrome/common/media_router/discovery/media_sink_internal.cc

 // 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.
 
 #include "chrome/common/media_router/discovery/media_sink_internal.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 
 namespace media_router {
 
 MediaSinkInternal::MediaSinkInternal(const MediaSink& sink,
                                      const DialSinkExtraData& dial_data)
     : sink_(sink), sink_type_(SinkType::DIAL) {
   dial_data_.Init(dial_data);
 }
 
 MediaSinkInternal::MediaSinkInternal(const MediaSink& sink,
                                      const CastSinkExtraData& cast_data)
     : sink_(sink), sink_type_(SinkType::CAST) {
   cast_data_.Init(cast_data);
 }
 
 MediaSinkInternal::MediaSinkInternal() : sink_type_(SinkType::GENERIC) {}
 
 MediaSinkInternal::MediaSinkInternal(const MediaSinkInternal& other) {
   InternalCopyConstructFrom(other);
 }
 
+MediaSinkInternal::MediaSinkInternal(MediaSinkInternal&& other) {
+  InternalMoveConstructFrom(std::move(other));
+}
+
 MediaSinkInternal::~MediaSinkInternal() {
   InternalCleanup();
 }
 
 MediaSinkInternal& MediaSinkInternal::operator=(
     const MediaSinkInternal& other) {
   if (this != &other) {
     if (sink_type_ == other.sink_type_) {
       InternalCopyAssignFrom(other);
     } else {
       InternalCleanup();
       InternalCopyConstructFrom(other);
     }
   }
 
   return *this;
 }
 
+MediaSinkInternal& MediaSinkInternal::operator=(
+    MediaSinkInternal&& other) noexcept {
+  InternalCleanup();
+  InternalMoveConstructFrom(std::move(other));
+
+  return *this;
+}
+
 bool MediaSinkInternal::operator==(const MediaSinkInternal& other) const {
   if (sink_type_ != other.sink_type_)
     return false;
 
   if (sink_ != other.sink_)
     return false;
 
   switch (sink_type_) {
     case SinkType::DIAL:
       return *dial_data_ == *(other.dial_data_);
@@ skipping 82 matching lines @@
       return;
     case SinkType::CAST:
       cast_data_.Init(*other.cast_data_);
       return;
     case SinkType::GENERIC:
       return;
   }
   NOTREACHED();
 }
 
+void MediaSinkInternal::InternalMoveConstructFrom(MediaSinkInternal&& other) {
+  sink_ = std::move(other.sink_);
+  sink_type_ = other.sink_type_;
+
+  switch (sink_type_) {
+    case SinkType::DIAL:
+      dial_data_.InitFromMove(std::move(other.dial_data_));
+      return;
+    case SinkType::CAST:
+      cast_data_.InitFromMove(std::move(other.cast_data_));
+      return;
+    case SinkType::GENERIC:
+      return;
+  }
+  NOTREACHED();
+}
+
 void MediaSinkInternal::InternalCleanup() {
   switch (sink_type_) {
     case SinkType::DIAL:
       dial_data_.Destroy();
       return;
     case SinkType::CAST:
       cast_data_.Destroy();
       return;
     case SinkType::GENERIC:
       return;
   }
   NOTREACHED();
 }
 
 DialSinkExtraData::DialSinkExtraData() = default;
 DialSinkExtraData::DialSinkExtraData(const DialSinkExtraData& other) = default;
 DialSinkExtraData::~DialSinkExtraData() = default;
 
 bool DialSinkExtraData::operator==(const DialSinkExtraData& other) const {
   return ip_address == other.ip_address && model_name == other.model_name &&
          app_url == other.app_url;
 }
 
 CastSinkExtraData::CastSinkExtraData() = default;
 CastSinkExtraData::CastSinkExtraData(const CastSinkExtraData& other) = default;
 CastSinkExtraData::~CastSinkExtraData() = default;
 
 bool CastSinkExtraData::operator==(const CastSinkExtraData& other) const {
-  return ip_address == other.ip_address && model_name == other.model_name &&
-         capabilities == other.capabilities &&
-         cast_channel_id == other.cast_channel_id;
+  return ip_address == other.ip_address && port == other.port &&
+         model_name == other.model_name && capabilities == other.capabilities &&
+         cast_channel_id == other.cast_channel_id &&
+         discovered_by_dial == other.discovered_by_dial;
 }
 
 }  // namespace media_router