[MediaRouter] Replace RouteMessage with PresentationConnectionMessage

chrome/browser/media/android/router/media_router_android.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 "chrome/browser/media/android/router/media_router_android.h"
 
 #include <string>
 #include <utility>
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 #include "chrome/browser/media/router/route_message_observer.h"
-#include "chrome/common/media_router/route_message.h"
 #include "chrome/common/media_router/route_request_result.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/common/presentation_connection_message.h"
 #include "url/gurl.h"
 
 namespace media_router {
 
 MediaRouterAndroid::MediaRouteRequest::MediaRouteRequest(
     const MediaSource& source,
     const std::string& presentation_id,
     std::vector<MediaRouteResponseCallback> callbacks)
     : media_source(source),
       presentation_id(presentation_id),
@@ skipping 280 matching lines @@
   std::move(*callback).Run(success);
   message_callbacks_.Remove(callback_id);
 }
 
 void MediaRouterAndroid::OnMessage(const MediaRoute::Id& route_id,
                                    const std::string& message) {
   auto it = message_observers_.find(route_id);
   if (it == message_observers_.end())
     return;
 
-  std::vector<RouteMessage> messages(1);
-  messages.front().type = RouteMessage::TEXT;
-  messages.front().text = message;
+  std::vector<content::PresentationConnectionMessage> messages(1);

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

Does messages({message}) work?

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

Yeah uniform initialization should work. I will use messages = {message};

+  messages.front().message = message;
   for (auto& observer : *it->second.get())
     observer.OnMessagesReceived(messages);
 }
 
 void MediaRouterAndroid::RemoveRoute(const MediaRoute::Id& route_id) {
   for (auto it = active_routes_.begin(); it != active_routes_.end(); ++it)
     if (it->media_route_id() == route_id) {
       active_routes_.erase(it);
       break;
     }
 
   for (auto& observer : routes_observers_)
     observer.OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>());
 }
 
 }  // namespace media_router