[MediaRouter] Replace RouteMessage with PresentationConnectionMessage

content/public/common/presentation_connection_message.cc

 // Copyright 2015 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 "content/public/common/presentation_connection_message.h"
 
 #include <utility>
 
+#include "base/base64.h"
+#include "base/json/string_escape.h"
+
 namespace content {
 
 // TODO(crbug.com/524128): This restriction comes from Cast.  Raise this limit
 // for non-Cast presentations.
 const size_t kMaxPresentationConnectionMessageSize = 64 * 1024;  // 64 KB.
 
 PresentationConnectionMessage::PresentationConnectionMessage() = default;
 
 PresentationConnectionMessage::PresentationConnectionMessage(
     std::string message)
     : message(std::move(message)) {}
 
 PresentationConnectionMessage::PresentationConnectionMessage(
     std::vector<uint8_t> data)
     : data(std::move(data)) {}
 
 PresentationConnectionMessage::PresentationConnectionMessage(
-    PresentationConnectionMessage&& other) = default;
+    const PresentationConnectionMessage& other) = default;
+
+// Note: "move constructor noexcept = default" currently does not compile on
+// Windows and Android (crbug.com/706963).
+PresentationConnectionMessage::PresentationConnectionMessage(
+    PresentationConnectionMessage&& other) noexcept
+    : message(std::move(other.message)), data(std::move(other.data)) {}
 
 PresentationConnectionMessage::~PresentationConnectionMessage() {}
 
 bool PresentationConnectionMessage::operator==(
     const PresentationConnectionMessage& other) const {
   return this->data == other.data && this->message == other.message;
 }
 
 PresentationConnectionMessage& PresentationConnectionMessage::operator=(

[mark a. foltz, 2017/06/28 07:29:55]

Can you add a note explaining why this isn't move-only?

[imcheng, 2017/06/29 08:21:09]

added comment in header file.

+    const PresentationConnectionMessage& other) = default;
+
+PresentationConnectionMessage& PresentationConnectionMessage::operator=(
     PresentationConnectionMessage&& other) = default;
 
 bool PresentationConnectionMessage::is_binary() const {
   return data.has_value();
 }
 
+std::string PresentationConnectionMessage::ToHumanReadableString() const {

[mark a. foltz, 2017/06/28 07:29:56]

This only seems to be called from logging in unittests.  Guard with #ifdef
!NDEBUG?

[imcheng, 2017/06/29 08:21:09]

Added #ifndef NDEBUG.

[imcheng, 2017/06/29 17:58:23]

It turns out we build unit tests on release builds, so the macro won't work. I
will move this to test_helper.{cc,h} instead.

+  if (!message && !data)
+    return "null";
+  std::string result;
+  if (message) {
+    result = "text=";
+    base::EscapeJSONString(*message, true, &result);
+  } else {
+    const base::StringPiece src(reinterpret_cast<const char*>(data->data()),
+                                data->size());
+    base::Base64Encode(src, &result);
+    result = "binary=" + result;
+  }
+  return result;
+}
+
 }  // namespace content