[Media Router] Connection state change listening redesign part 2.

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 <map>
 #include <string>
@@ skipping 72 matching lines @@
       ListenForDefaultSessionStartAfterSet);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
       DefaultSessionStartReset);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
                            ReceiveSessionMessagesAfterReset);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
                            MaxPendingStartSessionRequests);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
                            MaxPendingJoinSessionRequests);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
-                           ListenForSessionStateChange);
+                           ListenForConnectionStateChange);
+
   // Maximum number of pending JoinSession requests at any given time.
   static const int kMaxNumQueuedSessionRequests = 10;
 
   using PresentationSessionMojoCallback =
       mojo::Callback<void(presentation::PresentationSessionInfoPtr)>;
-  using SessionStateCallback =
-      mojo::Callback<void(presentation::PresentationSessionInfoPtr,
-                          presentation::PresentationConnectionState)>;
   using SessionMessagesCallback =
       mojo::Callback<void(mojo::Array<presentation::SessionMessagePtr>)>;
   using SendMessageMojoCallback = mojo::Callback<void(bool)>;
 
   // Listener implementation owned by PresentationServiceImpl. An instance of
   // this is created when PresentationRequest.getAvailability() is resolved.
   // The instance receives screen availability results from the embedder and
   // propagates results back to PresentationServiceImpl.
   class CONTENT_EXPORT ScreenAvailabilityListenerImpl
       : public PresentationScreenAvailabilityListener {
@@ skipping 50 matching lines @@
   void JoinSession(
       const mojo::String& presentation_url,
       const mojo::String& presentation_id,
       const NewSessionMojoCallback& 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(
       presentation::PresentationSessionInfoPtr session) override;
 
   // Creates a binding between this object and |request|.
   void Bind(mojo::InterfaceRequest<presentation::PresentationService> request);
 
   // WebContentsObserver override.
   void DidNavigateAnyFrame(
       content::RenderFrameHost* render_frame_host,
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
 
   // PresentationServiceDelegate::Observer
   void OnDelegateDestroyed() override;
 
   // Passed to embedder's implementation of PresentationServiceDelegate for
   // later invocation when default presentation has started.
   void OnDefaultPresentationStarted(
       const PresentationSessionInfo& session_info);
 
   // Finds the callback from |pending_join_session_cbs_| using
   // |request_session_id|.
   // If it exists, invoke it with |session| and |error|, then erase it from
   // |pending_join_session_cbs_|.
-  void RunAndEraseJoinSessionMojoCallback(
+  // Returns true if the callback was found.
+  bool RunAndEraseJoinSessionMojoCallback(
       int request_session_id,
       presentation::PresentationSessionInfoPtr session,
       presentation::PresentationErrorPtr error);
 
   // Removes all listeners and resets default presentation URL on this instance
   // and informs the PresentationServiceDelegate of such.
   void Reset();
 
   // These functions are bound as base::Callbacks and passed to
   // embedder's implementation of PresentationServiceDelegate for later
   // invocation.
   void OnStartSessionSucceeded(
       int request_session_id,
       const PresentationSessionInfo& session_info);
   void OnStartSessionError(
       int request_session_id,
       const PresentationError& error);
   void OnJoinSessionSucceeded(
       int request_session_id,
       const PresentationSessionInfo& session_info);
   void OnJoinSessionError(
       int request_session_id,
       const PresentationError& error);
   void OnSendMessageCallback(bool sent);
 
+  // Calls to |delegate_| to start listening for state changes for |connection|.
+  // State changes will be returned via |OnConnectionStateChanged|.
+  void ListenForConnectionStateChange(
+      const PresentationSessionInfo& connection);
+
   // Passed to embedder's implementation of PresentationServiceDelegate for
   // later invocation when session messages arrive.
   void OnSessionMessages(
       const content::PresentationSessionInfo& session,
       const ScopedVector<PresentationSessionMessage>& messages,
       bool pass_ownership);
 
   // 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,
-                             PresentationConnectionState session_state);
+  // PresentationConnection's state has changed.
+  void OnConnectionStateChanged(const PresentationSessionInfo& connection,
+                                PresentationConnectionState state);
 
   // Returns true if this object is associated with |render_frame_host|.
   bool FrameMatches(content::RenderFrameHost* render_frame_host) const;
 
   // Embedder-specific delegate to forward Presentation requests to.
   // May be null if embedder does not support Presentation API.
   PresentationServiceDelegate* delegate_;
 
   // Proxy to the PresentationServiceClient to send results (e.g., screen
   // availability) to.
@@ skipping 29 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_