Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with…

chrome/browser/media/router/media_router_mojo_impl.cc

Index: chrome/browser/media/router/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc
index aab17bb30bed8e07cfe4b19cc903858bf521f0c8..c9c57fed476216831bcd3c538303ee3ead7b33ab 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl.cc
@@ -49,9 +49,9 @@ void EventPageWakeComplete(bool success) {
 scoped_ptr<content::PresentationSessionMessage>
 ConvertToPresentationSessionMessage(interfaces::RouteMessagePtr input) {
   DCHECK(!input.is_null());
-  // TODO(haibinlu): get presentation_url&id from route_id
-  std::string presentation_url;
-  std::string presentation_id;
+  const auto& id_and_url = GetPresentationIdAndUrl(input->route_id);
+  const std::string& presentation_id = id_and_url.first;
+  const std::string& presentation_url = id_and_url.second;
   scoped_ptr<content::PresentationSessionMessage> output;
   switch (input->type) {
     case interfaces::RouteMessage::Type::TYPE_TEXT: {