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

chrome/browser/media/router/media_router_mojo_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_MEDIA_ROUTER_MOJO_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/thread_task_runner_handle.h"
-#include "base/threading/thread_checker.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/issue_manager.h"
-#include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router.mojom.h"
+#include "chrome/browser/media/router/media_router_base.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 class EventPageTracker;
 }
 
 namespace media_router {
 
 // MediaRouter implementation that delegates calls to the component extension.
 // Also handles the suspension and wakeup of the component extension.
-class MediaRouterMojoImpl : public MediaRouter,
+class MediaRouterMojoImpl : public MediaRouterBase,
                             public interfaces::MediaRouter {
  public:
   ~MediaRouterMojoImpl() override;
 
   // Sets up the MediaRouterMojoImpl instance owned by |context| to handle
   // MediaRouterObserver requests from the component extension given by
   // |extension_id|. Creates the MediaRouterMojoImpl instance if it does not
   // exist.
   // Called by the Mojo module registry.
   // |extension_id|: The ID of the component extension, used for querying
@@ skipping 139 matching lines @@
   void RegisterIssuesObserver(IssuesObserver* observer) override;
   void UnregisterIssuesObserver(IssuesObserver* observer) override;
   void RegisterPresentationSessionMessagesObserver(
       PresentationSessionMessagesObserver* observer) override;
   void UnregisterPresentationSessionMessagesObserver(
       PresentationSessionMessagesObserver* observer) override;
   void RegisterLocalMediaRoutesObserver(
       LocalMediaRoutesObserver* observer) override;
   void UnregisterLocalMediaRoutesObserver(
       LocalMediaRoutesObserver* observer) override;
-  void RegisterPresentationConnectionStateObserver(
-      PresentationConnectionStateObserver* observer) override;
-  void UnregisterPresentationConnectionStateObserver(
-      PresentationConnectionStateObserver* observer) override;
 
   // These calls invoke methods in the component extension via Mojo.
   void DoCreateRoute(const MediaSource::Id& source_id,
                      const MediaSink::Id& sink_id,
                      const std::string& origin,
                      int tab_id,
                      const std::vector<MediaRouteResponseCallback>& callbacks);
   void DoJoinRoute(const MediaSource::Id& source_id,
                    const std::string& presentation_id,
                    const std::string& origin,
@@ skipping 83 matching lines @@
   base::ScopedPtrHashMap<MediaRoute::Id,
                          scoped_ptr<PresentationSessionMessagesObserverList>>
       messages_observers_;
 
   // IDs of MediaRoutes being listened for messages. Note that this is
   // different from |message_observers_| because we might be waiting for
   // |OnRouteMessagesReceived()| to be invoked after all observers for that
   // route have been removed.
   std::set<MediaRoute::Id> route_ids_listening_for_messages_;
 
-  using PresentationConnectionStateObserverList =
-      base::ObserverList<PresentationConnectionStateObserver>;
-  base::ScopedPtrHashMap<MediaRoute::Id,
-                         scoped_ptr<PresentationConnectionStateObserverList>>
-      presentation_connection_state_observers_;
-
   IssueManager issue_manager_;
 
   // Binds |this| to a Mojo connection stub for interfaces::MediaRouter.
   scoped_ptr<mojo::Binding<interfaces::MediaRouter>> binding_;
 
   // Mojo proxy object for the Media Route Provider Manager.
   // Set to null initially, and later set to the Provider Manager proxy object
   // passed in via |RegisterMediaRouteProvider()|.
   // This is set to null again when the component extension is suspended
   // if or a Mojo channel error occured.
@@ skipping 18 matching lines @@
 
   // Observes local routes in order to notify LocalMediaRoutesObservers when
   // there are no more local routes.
   scoped_ptr<MediaRoutesObserver> routes_observer_;
 
   // The last reported sink availability from the media route provider manager.
   interfaces::MediaRouter::SinkAvailability availability_;
 
   int wakeup_attempt_count_;
 
-  base::ThreadChecker thread_checker_;
-
   base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_