Revert of [Presentation API] Implement ondefaultsessionstart in PSImpl.

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 91 matching lines @@
 
     // Indicates if this context has any pending callbacks.
     bool HasPendingCallbacks() const;
 
    private:
     std::string presentation_url_;
     ScopedVector<ScreenAvailabilityMojoCallback> callbacks_;
     scoped_ptr<bool> available_ptr_;
   };
 
-  class CONTENT_EXPORT DefaultSessionStartContext {
-   public:
-    DefaultSessionStartContext();
-    ~DefaultSessionStartContext();
-
-    // Adds a callback. May invoke the callback immediately if |session| using
-    // default presentation URL was already started.
-    void AddCallback(const DefaultSessionMojoCallback& callback);
-
-    // Sets the session info. Maybe invoke callbacks queued with AddCallback().
-    void set_session(const PresentationSessionInfo& session);
-
-   private:
-    // Flush all queued callbacks by invoking them with null
-    // PresentationSessionInfoPtr.
-    void Reset();
-
-    ScopedVector<DefaultSessionMojoCallback> callbacks_;
-    scoped_ptr<PresentationSessionInfo> session_;
-  };
-
   // Context for a StartSession request.
   class CONTENT_EXPORT StartSessionRequest {
    public:
     StartSessionRequest(const std::string& presentation_url,
                         const std::string& presentation_id,
                         const NewSessionMojoCallback& callback);
     ~StartSessionRequest();
 
     // Retrieves the pending callback from this request, transferring ownership
     // to the caller.
@@ skipping 17 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
       ThisRenderFrameDeleted);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
       NotThisRenderFrameDeleted);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
       SetDefaultPresentationUrl);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
       SetSameDefaultPresentationUrl);
   FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
       ClearDefaultPresentationUrl);
-  FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
-      ListenForDefaultSessionStart);
-  FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
-      ListenForDefaultSessionStartAfterSet);
-  FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
-      DefaultSessionStartReset);
 
   // |render_frame_host|: The RFH this instance is associated with.
   // |web_contents|: The WebContents to observe.
   // |delegate|: Where Presentation API requests are delegated to. Not owned
   // by this class.
   PresentationServiceImpl(
       RenderFrameHost* render_frame_host,
       WebContents* web_contents,
       PresentationServiceDelegate* delegate);
 
@@ skipping 31 matching lines @@
 
   // 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;
-  void OnDefaultPresentationStarted(const PresentationSessionInfo& session)
-      override;
 
   // Finds the callback from |pending_session_cbs_| using |request_session_id|.
   // If it exists, invoke it with |session| and |error|, then erase it from
   // |pending_session_cbs_|.
   void RunAndEraseNewSessionMojoCallback(
       int request_session_id,
       presentation::PresentationSessionInfoPtr session,
       presentation::PresentationErrorPtr error);
 
   // Sets |default_presentation_url_| to |presentation_url| and informs the
@@ skipping 39 matching lines @@
 
   // Invokes |callback| with an error.
   static void InvokeNewSessionMojoCallbackWithError(
       const NewSessionMojoCallback& callback);
 
   // Gets the ScreenAvailabilityContext for |presentation_url|, or creates one
   // if it does not exist.
   ScreenAvailabilityContext* GetOrCreateAvailabilityContext(
       const std::string& presentation_url);
 
-  // Returns true if this object is associated with |render_frame_host|.
-  bool FrameMatches(content::RenderFrameHost* render_frame_host) const;
-
+  RenderFrameHost* render_frame_host_;
   PresentationServiceDelegate* delegate_;
 
   // Map from presentation URL to its ScreenAvailabilityContext state machine.
   base::hash_map<std::string, linked_ptr<ScreenAvailabilityContext>>
       availability_contexts_;
 
   std::string default_presentation_url_;
   std::string default_presentation_id_;
 
   // We only allow one StartSession request to be processed at a time.
   // StartSession requests are queued here. When a request has been processed,
   // it is removed from head of the queue.
   std::deque<linked_ptr<StartSessionRequest>> queued_start_session_requests_;
 
   // Indicates that a StartSession request is currently being processed.
   bool is_start_session_pending_;
 
   int next_request_session_id_;
   base::hash_map<int, linked_ptr<NewSessionMojoCallback>> pending_session_cbs_;
 
-  scoped_ptr<DefaultSessionStartContext> default_session_start_context_;
-
   // RAII binding of |this| to an Presentation interface request.
   // The binding is removed when binding_ is cleared or goes out of scope.
   scoped_ptr<mojo::Binding<presentation::PresentationService>> binding_;
 
-  // ID of the RenderFrameHost this object is associated with.
-  int render_process_id_;
-  int render_frame_id_;
-
   // 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_