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

content/browser/presentation/presentation_service_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 CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
@@ skipping 164 matching lines @@
   void StopListeningForScreenAvailability() override;
   void ListenForDefaultSessionStart(
       const DefaultSessionMojoCallback& callback) override;
   void StartSession(
       const mojo::String& presentation_url,
       const NewSessionMojoCallback& callback) override;
   void JoinSession(
       const mojo::String& presentation_url,
       const mojo::String& presentation_id,
       const NewSessionMojoCallback& callback) override;
-  void SendSessionMessage(
-      presentation::SessionMessagePtr session_message,
-      const SendMessageMojoCallback& callback) override;
+  void SendSessionMessage(presentation::PresentationSessionInfoPtr session_info,
+                          presentation::SessionMessagePtr session_message,
+                          const SendMessageMojoCallback& callback) override;
   void CloseSession(
       const mojo::String& presentation_url,
       const mojo::String& presentation_id) override;
   void ListenForSessionStateChange() override;
   void ListenForSessionMessages(
-      const SessionMessagesCallback& callback) override;
+      presentation::PresentationSessionInfoPtr session) override;
 
   // Creates a binding between this object and |request|.
   void Bind(mojo::InterfaceRequest<presentation::PresentationService> request);
 
   // mojo::ErrorHandler override.
   // Note that this is called when the RenderFrameHost is deleted.
   void OnConnectionError() override;
 
   // WebContentsObserver override.
   void DidNavigateAnyFrame(
@@ skipping 36 matching lines @@
   void OnJoinSessionSucceeded(
       int request_session_id,
       const PresentationSessionInfo& session_info);
   void OnJoinSessionError(
       int request_session_id,
       const PresentationError& error);
   void OnSendMessageCallback(bool sent);
 
   // Passed to embedder's implementation of PresentationServiceDelegate for
   // later invocation when session messages arrive.
-  // For optimization purposes, this method will empty the messages
-  // passed to it.
   void OnSessionMessages(
-      scoped_ptr<ScopedVector<PresentationSessionMessage>> messages);
+      const content::PresentationSessionInfo& session,
+      const ScopedVector<PresentationSessionMessage>& messages);
 
   // Associates a JoinSession |callback| with a unique request ID and
   // stores it in a map.
   // Returns a positive value on success.
   int RegisterJoinSessionCallback(const NewSessionMojoCallback& callback);
 
   // Invoked by the embedder's PresentationServiceDelegate when a
   // presentation session's state has changed.
   void OnSessionStateChanged(const PresentationSessionInfo& session_info,
                              PresentationSessionState session_state);
@@ skipping 39 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<PresentationServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PresentationServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PRESENTATION_PRESENTATION_SERVICE_IMPL_H_