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

chrome/browser/media/router/presentation_service_delegate_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 73 matching lines @@
                    const std::string& presentation_url,
                    const std::string& presentation_id,
                    const PresentationSessionSuccessCallback& success_cb,
                    const PresentationSessionErrorCallback& error_cb) override;
   void CloseSession(int render_process_id,
                     int render_frame_id,
                     const std::string& presentation_id) override;
   void ListenForSessionMessages(
       int render_process_id,
       int render_frame_id,
-      const PresentationSessionMessageCallback& message_cb) override;
-  void SendMessage(
-      int render_process_id,
-      int render_frame_id,
-      scoped_ptr<content::PresentationSessionMessage> message_request,
-      const SendMessageCallback& send_message_cb) override;
+      const content::PresentationSessionInfo& session,
+      const content::PresentationSessionMessageCallback& message_cb) override;
+  void SendMessage(int render_process_id,
+                   int render_frame_id,
+                   const content::PresentationSessionInfo& session,
+                   scoped_ptr<content::PresentationSessionMessage> message,
+                   const SendMessageCallback& send_message_cb) override;
   void ListenForSessionStateChange(
       int render_process_id,
       int render_frame_id,
       const content::SessionStateChangedCallback& state_changed_cb) override;
 
   // Callback invoked when there is a route response from CreateRoute/JoinRoute
   // outside of a Presentation API request. This could be due to
   // browser action (e.g., browser initiated media router dialog) or
   // a media route provider (e.g., autojoin).
-  void OnRouteResponse(const MediaRoute* route, const std::string& error);
+  void OnRouteResponse(const MediaRoute* route,
+                       const std::string& presentation_id,
+                       const std::string& error);
 
   // Returns the default MediaSource for this tab if there is one.
   // Returns an empty MediaSource otherwise.
   MediaSource default_source() const { return default_source_; }
 
   content::WebContents* web_contents() const { return web_contents_; }
   const GURL& default_frame_url() const { return default_frame_url_; }
 
   // Observer interface for listening to default MediaSource changes for the
   // WebContents.
@@ skipping 33 matching lines @@
   // not have a persentation URL, returns the tab mirroring MediaSource.
   MediaSource GetMediaSourceFromListener(
       content::PresentationScreenAvailabilityListener* listener);
 
   void OnJoinRouteResponse(int render_process_id,
                            int render_frame_id,
                            const content::PresentationSessionInfo& session,
                            const PresentationSessionSuccessCallback& success_cb,
                            const PresentationSessionErrorCallback& error_cb,
                            const MediaRoute* route,
+                           const std::string& presentation_id,
                            const std::string& error_text);
 
   void OnStartSessionSucceeded(
       int render_process_id,
       int render_frame_id,
       const PresentationSessionSuccessCallback& success_cb,
       const content::PresentationSessionInfo& new_session,
       const MediaRoute::Id& route_id);
 
   // Returns |true| if the frame is the main frame of |web_contents_|.
@@ skipping 22 matching lines @@
   scoped_ptr<PresentationFrameManager> frame_manager_;
 
   base::WeakPtrFactory<PresentationServiceDelegateImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PresentationServiceDelegateImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_