[MediaRouter] Replace RouteMessage with PresentationConnectionMessage

chrome/browser/media/router/browser_presentation_connection_proxy.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/browser/media/router/browser_presentation_connection_proxy.h"
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 
 #include "chrome/browser/media/router/media_router.h"
-#include "chrome/common/media_router/route_message.h"
 
 namespace media_router {
 
 namespace {
 
 void OnMessageReceivedByRenderer(bool success) {
   DLOG_IF(ERROR, !success)
       << "Renderer PresentationConnection failed to process message!";
 }
 
@@ skipping 28 matching lines @@
         route_id_,
         base::MakeUnique<std::vector<uint8_t>>(std::move(message.data.value())),
         std::move(on_message_callback));
   } else {
     router_->SendRouteMessage(route_id_, message.message.value(),
                               std::move(on_message_callback));
   }
 }
 
 void BrowserPresentationConnectionProxy::OnMessagesReceived(
-    const std::vector<RouteMessage>& messages) {
+    const std::vector<content::PresentationConnectionMessage>& messages) {
   DVLOG(2) << __func__ << ", number of messages : " << messages.size();
-  // TODO(mfoltz): Remove RouteMessage and replace with move-only
-  // PresentationConnectionMessage.
-  std::vector<content::PresentationConnectionMessage> presentation_messages;
-  for (const RouteMessage& message : messages) {
-    if (message.type == RouteMessage::TEXT && message.text) {
-      presentation_messages.emplace_back(message.text.value());
-    } else if (message.type == RouteMessage::BINARY && message.binary) {
-      presentation_messages.emplace_back(message.binary.value());
-    } else {
-      NOTREACHED() << "Unknown route message type";
-    }
-  }
-
   // TODO(imcheng): It would be slightly more efficient to send messages in
   // a single batch.
-  for (auto& message : presentation_messages) {
-    target_connection_ptr_->OnMessage(std::move(message),
+  for (const auto& message : messages) {
+    target_connection_ptr_->OnMessage(message,
                                       base::Bind(&OnMessageReceivedByRenderer));
   }
 }
 }  // namespace media_router