Updates SessionMessage to ConnectionMessage.

content/public/browser/presentation_service_delegate.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_PUBLIC_BROWSER_PRESENTATION_SERVICE_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_PRESENTATION_SERVICE_DELEGATE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/presentation_connection_message.h"
 #include "content/public/browser/presentation_session.h"
-#include "content/public/browser/presentation_session_message.h"
 
 class GURL;
 
 namespace content {
 
 class PresentationScreenAvailabilityListener;
 
 using PresentationSessionStartedCallback =
     base::Callback<void(const PresentationSessionInfo&)>;
 using PresentationSessionErrorCallback =
     base::Callback<void(const PresentationError&)>;
 
 // Param #0: a vector of messages that are received.
 // Param #1: tells the callback handler that it may reuse strings or buffers
 //           in the messages contained within param #0.
-using PresentationSessionMessageCallback = base::Callback<
-    void(const ScopedVector<content::PresentationSessionMessage>&, bool)>;
+using PresentationConnectionMessageCallback = base::Callback<
+    void(const ScopedVector<content::PresentationConnectionMessage>&, bool)>;

[Avi (use Gerrit), 2016/12/13 02:23:53]

Can you follow up with a removal of ScopedVector in favor of vector<unique_ptr>?
That's http://crbug.com/554289 .

[CJ, 2016/12/13 22:05:35]

Done.

 
 struct PresentationConnectionStateChangeInfo {
   explicit PresentationConnectionStateChangeInfo(
       PresentationConnectionState state)
       : state(state),
         close_reason(PRESENTATION_CONNECTION_CLOSE_REASON_CONNECTION_ERROR) {}
   ~PresentationConnectionStateChangeInfo() = default;
 
   PresentationConnectionState state;
 
@@ skipping 122 matching lines @@
   // |presentation_id|: The ID of the presentation to terminate.
   virtual void Terminate(int render_process_id,
                          int render_frame_id,
                          const std::string& presentation_id) = 0;
 
   // Listens for messages for a presentation session.
   // |render_process_id|, |render_frame_id|: ID for originating frame.
   // |session|: URL and ID of presentation session to listen for messages.
   // |message_cb|: Invoked with a non-empty list of messages whenever there are
   // messages.
-  virtual void ListenForSessionMessages(
+  virtual void ListenForConnectionMessages(
       int render_process_id,
       int render_frame_id,
       const content::PresentationSessionInfo& session,
-      const PresentationSessionMessageCallback& message_cb) = 0;
+      const PresentationConnectionMessageCallback& message_cb) = 0;
 
   // Sends a message (string or binary data) to a presentation session.
   // |render_process_id|, |render_frame_id|: ID of originating frame.
   // |session|: The presentation session to send the message to.
   // |message|: The message to send. The embedder takes ownership of |message|.
   //            Must not be null.
   // |send_message_cb|: Invoked after handling the send message request.
-  virtual void SendMessage(int render_process_id,
-                           int render_frame_id,
-                           const content::PresentationSessionInfo& session,
-                           std::unique_ptr<PresentationSessionMessage> message,
-                           const SendMessageCallback& send_message_cb) = 0;
+  virtual void SendMessage(
+      int render_process_id,
+      int render_frame_id,
+      const content::PresentationSessionInfo& session,
+      std::unique_ptr<PresentationConnectionMessage> message,
+      const SendMessageCallback& send_message_cb) = 0;
 
   // Continuously listen for state changes for a PresentationConnection in a
   // frame.
   // |render_process_id|, |render_frame_id|: ID of frame.
   // |connection|: PresentationConnection to listen for state changes.
   // |state_changed_cb|: Invoked with the PresentationConnection and its new
   // state whenever there is a state change.
   virtual void ListenForConnectionStateChange(
       int render_process_id,
       int render_frame_id,
       const PresentationSessionInfo& connection,
       const PresentationConnectionStateChangedCallback& state_changed_cb) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_PRESENTATION_SERVICE_DELEGATE_H_