Remove unused methods from MediaRouterBase.

Bug: 1057100
Change-Id: I57cff2406fa4d11420dbbb3e450dc189f5dd97a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2364740
Commit-Queue: Evan Stade <estade@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799841}

chrome/browser/media/cast_remoting_connector_unittest.cc

@@ -48,37 +48,6 @@ RemotingSinkMetadataPtr GetDefaultSinkMetadata() {
   return metadata;
 }
 
-// Implements basic functionality of a subset of the MediaRouter for use by the
-// unit tests in this module. Note that MockMediaRouter will complain at runtime
-// if any methods were called that should not have been called.
-class FakeMediaRouter : public media_router::MockMediaRouter {
- public:
-  FakeMediaRouter() {}
-  ~FakeMediaRouter() final {}
-
-  void RegisterRemotingSource(SessionID tab_id,
-                              CastRemotingConnector* remoting_source) final {
-    EXPECT_FALSE(tab_id_.is_valid());
-    tab_id_ = tab_id;
-    connector_ = remoting_source;
-  }
-
-  void UnregisterRemotingSource(SessionID tab_id) final {
-    EXPECT_EQ(tab_id, tab_id_);
-    tab_id_ = SessionID::InvalidValue();
-    connector_ = nullptr;
-  }
-
-  // Get the registered tab ID.
-  SessionID tab_id() const { return tab_id_; }
-
- private:
-  SessionID tab_id_ = SessionID::InvalidValue();
-  CastRemotingConnector* connector_ = nullptr;
-
-  base::WeakPtrFactory<FakeMediaRouter> weak_factory_{this};
-};
-
 class MockRemotingSource : public media::mojom::RemotingSource {
  public:
   MockRemotingSource() {}
@@ -208,13 +177,9 @@ class CastRemotingConnectorTest : public ::testing::Test {
 
   CastRemotingConnector* GetConnector() const { return connector_.get(); }
 
-  FakeMediaRouter* GetMediaRouter() const {
-    return const_cast<FakeMediaRouter*>(&media_router_);
-  }
-
  private:
   content::BrowserTaskEnvironment task_environment_;
-  FakeMediaRouter media_router_;
+  media_router::MockMediaRouter media_router_;
   sync_preferences::TestingPrefServiceSyncable pref_service_;
   std::unique_ptr<CastRemotingConnector> connector_;
 };

chrome/browser/media/router/media_router.h

@@ -15,7 +15,6 @@
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/media/cast_remoting_connector.h"
 #include "chrome/browser/media/router/route_message_observer.h"
 #include "chrome/common/media_router/media_route.h"
 #include "chrome/common/media_router/media_route_provider_helper.h"
@@ -200,14 +199,6 @@ class MediaRouter : public KeyedService {
   virtual base::Value GetLogs() const = 0;
 #endif  // !defined(OS_ANDROID)
 
-  // Registers/Unregisters a CastRemotingConnector with the |tab_id|. For a
-  // given |tab_id|, only one CastRemotingConnector can be registered. The
-  // registered CastRemotingConnector should be removed before it is destroyed.
-  virtual void RegisterRemotingSource(
-      SessionID tab_id,
-      CastRemotingConnector* remoting_source) = 0;
-  virtual void UnregisterRemotingSource(SessionID tab_id) = 0;
-
   // Returns media router state as a JSON string represented by base::Value.
   // Includes known sinks and sink compatibility with media sources.
   // Used by chrome://media-router-internals.

chrome/browser/media/router/media_router_base.cc

@@ -170,23 +170,6 @@ void MediaRouterBase::Shutdown() {
   internal_routes_observer_.reset();
 }
 
-void MediaRouterBase::RegisterRemotingSource(
-    SessionID tab_id,
-    CastRemotingConnector* remoting_source) {
-  auto it = remoting_sources_.find(tab_id);
-  if (it != remoting_sources_.end()) {
-    DCHECK(remoting_source == it->second);
-    return;
-  }
-  remoting_sources_.emplace(tab_id, remoting_source);
-}
-
-void MediaRouterBase::UnregisterRemotingSource(SessionID tab_id) {
-  auto it = remoting_sources_.find(tab_id);
-  DCHECK(it != remoting_sources_.end());
-  remoting_sources_.erase(it);
-}
-
 base::Value MediaRouterBase::GetState() const {
   NOTREACHED() << "Should not invoke MediaRouterBase::GetState()";
   return base::Value(base::Value::Type::DICTIONARY);

chrome/browser/media/router/media_router_base.h

@@ -49,9 +49,6 @@ class MediaRouterBase : public MediaRouter {
       mojo::PendingRemote<mojom::MediaStatusObserver> observer) override;
   base::Value GetLogs() const override;
 #endif  // !defined(OS_ANDROID)
-  void RegisterRemotingSource(SessionID tab_id,
-                              CastRemotingConnector* remoting_source) override;
-  void UnregisterRemotingSource(SessionID tab_id) override;
   base::Value GetState() const override;
   void GetProviderState(
       MediaRouteProviderId provider_id,
@@ -94,12 +91,6 @@ class MediaRouterBase : public MediaRouter {
       std::unique_ptr<PresentationConnectionStateChangedCallbacks>>
       presentation_connection_state_callbacks_;
 
-  // Stores CastRemotingConnectors that can be connected to the MediaRemoter
-  // for media remoting when MediaRemoter is started. The map uses the tab ID
-  // as the key.
-  std::unordered_map<SessionID, CastRemotingConnector*, SessionID::Hasher>
-      remoting_sources_;
-
  private:
   friend class MediaRouterBaseTest;
   friend class MediaRouterFactory;

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

@@ -16,6 +16,7 @@
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/cast_mirroring_service_host.h"
+#include "chrome/browser/media/cast_remoting_connector.h"
 #include "chrome/browser/media/router/event_page_request_manager.h"
 #include "chrome/browser/media/router/event_page_request_manager_factory.h"
 #include "chrome/browser/media/router/issues_observer.h"