[Presentation API] Change ListenForSessionMessages API to client-style.

chrome/browser/media/router/create_presentation_session_request.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/create_presentation_session_request.h"
 
 #include "chrome/browser/media/router/media_source_helper.h"
 
 using content::PresentationSessionInfo;
 using content::PresentationError;
@@ skipping 17 matching lines @@
 }
 
 CreatePresentationSessionRequest::~CreatePresentationSessionRequest() {
   if (!cb_invoked_) {
     error_cb_.Run(content::PresentationError(
         content::PRESENTATION_ERROR_UNKNOWN, "Unknown error."));
   }
 }
 
 void CreatePresentationSessionRequest::MaybeInvokeSuccessCallback(
+    const std::string& presentation_id,
     const MediaRoute::Id& route_id) {
   if (!cb_invoked_) {
     // Overwrite presentation ID.
     success_cb_.Run(content::PresentationSessionInfo(
-                        presentation_info_.presentation_url,
-                        GetPresentationIdAndUrl(route_id).first),
+                        presentation_info_.presentation_url, presentation_id),
                     route_id);
     cb_invoked_ = true;
   }
 }
 
 void CreatePresentationSessionRequest::MaybeInvokeErrorCallback(
     const content::PresentationError& error) {
   if (!cb_invoked_) {
     error_cb_.Run(error);
     cb_invoked_ = true;
   }
 }
 
 }  // namespace media_router