[Presentation API] Remove references to presentation sessions.

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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "chrome/browser/media/router/presentation_request.h"
 #include "chrome/browser/media/router/presentation_service_delegate_observers.h"
 #include "chrome/browser/media/router/render_frame_host_id.h"
 #include "content/public/browser/presentation_service_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace content {
 class PresentationScreenAvailabilityListener;
 class WebContents;
-struct PresentationSessionInfo;
 struct PresentationConnectionMessage;
+struct PresentationInfo;
 }  // namespace content
 
 namespace url {
 class Origin;
 }  // namespace url
 
 namespace media_router {
 
 class MediaRoute;
 class PresentationFrameManager;
 class RouteRequestResult;
 
 // Implementation of PresentationServiceDelegate that interfaces an instance of
 // WebContents with the Chrome Media Router. It uses the Media Router to handle
 // presentation API calls forwarded from PresentationServiceImpl. In addition,
 // it also provides default presentation URL that is required for creating
-// browser-initiated sessions.  It is scoped to the lifetime of a WebContents,
-// and is managed by the associated WebContents.
+// browser-initiated presentations.  It is scoped to the lifetime of a
+// WebContents, and is managed by the associated WebContents.
 class PresentationServiceDelegateImpl
     : public content::WebContentsUserData<PresentationServiceDelegateImpl>,
       public content::ControllerPresentationServiceDelegate {
  public:
   // Observer interface for listening to default presentation request
   // changes for the WebContents.
   class DefaultPresentationRequestObserver {
    public:
     virtual ~DefaultPresentationRequestObserver() = default;
 
@@ skipping 28 matching lines @@
       content::PresentationScreenAvailabilityListener* listener) override;
   void RemoveScreenAvailabilityListener(
       int render_process_id,
       int render_frame_id,
       content::PresentationScreenAvailabilityListener* listener) override;
   void Reset(int render_process_id, int render_frame_id) override;
   void SetDefaultPresentationUrls(
       int render_process_id,
       int render_frame_id,
       const std::vector<GURL>& default_presentation_urls,
-      const content::PresentationSessionStartedCallback& callback) override;
-  void StartSession(
+      const content::PresentationConnectionCallback& callback) override;
+  void StartPresentation(
       int render_process_id,
       int render_frame_id,
       const std::vector<GURL>& presentation_urls,
-      const content::PresentationSessionStartedCallback& success_cb,
-      const content::PresentationSessionErrorCallback& error_cb) override;
-  void JoinSession(
+      const content::PresentationConnectionCallback& success_cb,
+      const content::PresentationConnectionErrorCallback& error_cb) override;
+  void ReconnectPresentation(
       int render_process_id,
       int render_frame_id,
       const std::vector<GURL>& presentation_urls,
       const std::string& presentation_id,
-      const content::PresentationSessionStartedCallback& success_cb,
-      const content::PresentationSessionErrorCallback& error_cb) override;
+      const content::PresentationConnectionCallback& success_cb,
+      const content::PresentationConnectionErrorCallback& error_cb) override;
   void CloseConnection(int render_process_id,
                        int render_frame_id,
                        const std::string& presentation_id) override;
   void Terminate(int render_process_id,
                  int render_frame_id,
                  const std::string& presentation_id) override;
   void ListenForConnectionMessages(
       int render_process_id,
       int render_frame_id,
-      const content::PresentationSessionInfo& session,
+      const content::PresentationInfo& presentation_info,
       const content::PresentationConnectionMessageCallback& message_cb)
       override;
   void SendMessage(int render_process_id,
                    int render_frame_id,
-                   const content::PresentationSessionInfo& session,
+                   const content::PresentationInfo& presentation_info,
                    content::PresentationConnectionMessage message,
                    const SendMessageCallback& send_message_cb) override;
   void ListenForConnectionStateChange(
       int render_process_id,
       int render_frame_id,
-      const content::PresentationSessionInfo& connection,
+      const content::PresentationInfo& connection,
       const content::PresentationConnectionStateChangedCallback&
           state_changed_cb) override;
   void ConnectToPresentation(
       int render_process_id,
       int render_frame_id,
-      const content::PresentationSessionInfo& session,
+      const content::PresentationInfo& presentation_info,
       content::PresentationConnectionPtr controller_connection_ptr,
       content::PresentationConnectionRequest receiver_connection_request)
       override;
 
   // Callback invoked when a default PresentationRequest is started from a
   // browser-initiated dialog.
   void OnRouteResponse(const PresentationRequest& request,
                        const RouteRequestResult& result);
 
   // Adds / removes an observer for listening to default PresentationRequest
@@ skipping 44 matching lines @@
   // Returns |listener|'s presentation URL as a MediaSource. If |listener| does
   // 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 GURL& presentation_url,
       const std::string& presentation_id,
-      const content::PresentationSessionStartedCallback& success_cb,
-      const content::PresentationSessionErrorCallback& error_cb,
+      const content::PresentationConnectionCallback& success_cb,
+      const content::PresentationConnectionErrorCallback& error_cb,
       const RouteRequestResult& result);
 
-  void OnStartSessionSucceeded(
+  void OnStartPresentationSucceeded(
       int render_process_id,
       int render_frame_id,
-      const content::PresentationSessionStartedCallback& success_cb,
-      const content::PresentationSessionInfo& new_session,
+      const content::PresentationConnectionCallback& success_cb,
+      const content::PresentationInfo& new_presentation_info,
       const MediaRoute& route);
 
 #if !defined(OS_ANDROID)
   // Returns true if auto-join requests should be cancelled for |origin|.
   bool ShouldCancelAutoJoinForOrigin(const url::Origin& origin) const;
 #endif
 
   // References to the WebContents that owns this instance, and associated
   // browser profile's MediaRouter instance.
   content::WebContents* const web_contents_;
   MediaRouter* router_;
 
   std::unique_ptr<PresentationFrameManager> frame_manager_;
   PresentationServiceDelegateObservers observers_;
 
   base::WeakPtrFactory<PresentationServiceDelegateImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PresentationServiceDelegateImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_