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

chrome/browser/media/router/media_router_mojo_impl.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/router/media_router_mojo_impl.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 31 matching lines @@
 // TODO(imcheng): We should handle failure in this case. One way is to invoke
 // all pending requests with failure. (crbug.com/490787)
 void EventPageWakeComplete(bool success) {
   if (!success)
     LOG(ERROR) << "An error encountered while waking the event page.";
 }
 
 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: {
       DCHECK(!input->message.is_null());
       DCHECK(input->data.is_null());
       output = content::PresentationSessionMessage::CreateStringMessage(
           presentation_url, presentation_id, make_scoped_ptr(new std::string));
       input->message.Swap(output->message.get());
       return output.Pass();
     }
@@ skipping 397 matching lines @@
     return;
   }
 
   for (const auto& next_request : pending_requests_)
     next_request.Run();
 
   pending_requests_.clear();
 }
 
 }  // namespace media_router