Remove Media Router impl and BrowserContext factory.

The class is now redundant with the Media Router Mojo impl
class (to be landed in an upcoming CL.)

BUG=461815
R=imcheng@chromium.org
TBR=miu@chromium.org

Review URL: https://codereview.chromium.org/1137993005

Cr-Commit-Position: refs/heads/master@{#329659}

chrome/browser/media/router/BUILD.gn

@@ -8,7 +8,6 @@ import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 source_set("router") {
   deps = [
     ":router_core",
-    ":keyed_service_factories",
   ]
 }
 
@@ -32,8 +31,6 @@ source_set("router_core") {
     "media_route.h",
     "media_route_id.h",
     "media_router.h",
-    "media_router_impl.cc",
-    "media_router_impl.h",
     "media_router_type_converters.cc",
     "media_router_type_converters.h",
     "media_routes_observer.cc",
@@ -53,17 +50,6 @@ source_set("router_core") {
   ]
 }
 
-source_set("keyed_service_factories") {
-  deps = [
-    ":router_core",
-    "//components/keyed_service/content",
-  ]
-  sources = [
-    "media_router_impl_factory.cc",
-    "media_router_impl_factory.h",
-  ]
-}
-
 source_set("unit_tests") {
   testonly = true
   deps = [

chrome/browser/media/router/media_router.gyp

@@ -30,10 +30,6 @@
         'media_route.h',
         'media_route_id.h',
         'media_router.h',
-        'media_router_impl.cc',
-        'media_router_impl.h',
-        'media_router_impl_factory.cc',
-        'media_router_impl_factory.h',
         'media_router_type_converters.cc',
         'media_router_type_converters.h',
         'media_routes_observer.cc',

chrome/browser/media/router/media_router_impl.cc

-// 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.
-
-#include "chrome/browser/media/router/media_router_impl.h"
-
-#include <set>
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/stl_util.h"
-#include "chrome/browser/media/router/media_route.h"
-#include "chrome/browser/media/router/media_routes_observer.h"
-#include "chrome/browser/media/router/media_sink.h"
-#include "chrome/browser/media/router/media_sinks_observer.h"
-#include "chrome/browser/media/router/media_source.h"
-#include "chrome/browser/media/router/media_source_helper.h"
-
-namespace media_router {
-
-MediaRouterImpl::MediaRouterImpl() : provider_manager_host_(nullptr) {
-}
-
-MediaRouterImpl::~MediaRouterImpl() {
-}
-
-void MediaRouterImpl::Initialize(MediaRouter* provider_manager_host) {
-  DCHECK(!provider_manager_host_);
-  DCHECK(provider_manager_host);
-  provider_manager_host_ = provider_manager_host;
-}
-
-// TODO(imcheng): Implement NOTIMPLEMENTED() methods.
-void MediaRouterImpl::RequestRoute(const MediaSourceId& source,
-                                   const MediaSinkId& sink_id,
-                                   const MediaRouteResponseCallback& callback) {
-  NOTIMPLEMENTED();
-}
-
-void MediaRouterImpl::CloseRoute(const MediaRouteId& route_id) {
-  NOTIMPLEMENTED();
-}
-
-void MediaRouterImpl::PostMessage(const MediaRouteId& route_id,
-                                  const std::string& message) {
-  NOTIMPLEMENTED();
-}
-
-bool MediaRouterImpl::RegisterMediaSinksObserver(MediaSinksObserver* observer) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void MediaRouterImpl::UnregisterMediaSinksObserver(
-    MediaSinksObserver* observer) {
-  NOTIMPLEMENTED();
-}
-
-bool MediaRouterImpl::RegisterMediaRoutesObserver(
-    MediaRoutesObserver* observer) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void MediaRouterImpl::UnregisterMediaRoutesObserver(
-    MediaRoutesObserver* observer) {
-  NOTIMPLEMENTED();
-}
-
-}  // namespace media_router

chrome/browser/media/router/media_router_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_IMPL_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_IMPL_H_
-
-#include <map>
-#include <queue>
-#include <string>
-#include <vector>
-
-#include "base/callback.h"
-#include "base/containers/hash_tables.h"
-#include "base/gtest_prod_util.h"
-#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
-#include "base/threading/thread_checker.h"
-#include "chrome/browser/media/router/media_router.h"
-#include "chrome/browser/media/router/media_sinks_observer.h"
-#include "components/keyed_service/core/keyed_service.h"
-
-namespace base {
-template <typename T>
-struct DefaultLazyInstanceTraits;
-}  // namespace base
-
-namespace media_router {
-
-class MediaRoute;
-class MediaRouterApiImpl;
-class MediaRoutesObserver;
-struct RoutesQueryResult;
-
-// Delegates calls to another implementation of MediaRouter, which in turn
-// handles communication with the Media Route Provider Manager (MRPM).
-// Instances of this class are created by MediaRouterImplFactory.
-// MediaRouterImpl is a profile-keyed service.
-// MediaRouterImpl runs on the browser UI thread. All observers/callbacks
-// registered to this class must also run in the UI thread.
-class MediaRouterImpl : public MediaRouter, public KeyedService {
- public:
-  ~MediaRouterImpl() override;
-
-  // |provider_manager_host_| must be null at the time this is called.
-  // |provider_manager_host| must not be null.
-  // Does not take ownership of |provider_manager_host_|.
-  // This function can only be called once.
-  void Initialize(MediaRouter* provider_manager_host);
-
-  // MediaRouter implementation.
-  void RequestRoute(const MediaSourceId& source,
-                    const MediaSinkId& sink_id,
-                    const MediaRouteResponseCallback& callback) override;
-  void CloseRoute(const MediaRouteId& route_id) override;
-  void PostMessage(const MediaRouteId& route_id,
-                   const std::string& message) override;
-
- private:
-  friend class MediaRouterImplFactory;
-
-  // Use MediaRouterImplFactory::GetForBrowserContext().
-  MediaRouterImpl();
-
-  // MediaRouter implementation.
-  bool RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
-  void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
-  bool RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
-  void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
-
-  // MRPM host to forward calls to MRPM to.
-  // This class does not own provider_manager_host_.
-  MediaRouter* provider_manager_host_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaRouterImpl);
-};
-
-}  // namespace media_router
-
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_IMPL_H_

chrome/browser/media/router/media_router_impl_factory.cc

-// 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.
-
-#include "chrome/browser/media/router/media_router_impl_factory.h"
-
-#include "chrome/browser/media/router/media_router_impl.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
-
-using content::BrowserContext;
-
-namespace media_router {
-
-// static
-MediaRouterImpl* MediaRouterImplFactory::GetMediaRouterForBrowserContext(
-    BrowserContext* context) {
-  DCHECK(context);
-  return static_cast<MediaRouterImpl*>(
-      GetInstance()->GetServiceForBrowserContext(context, true));
-}
-
-// static
-MediaRouterImplFactory* MediaRouterImplFactory::GetInstance() {
-  return Singleton<MediaRouterImplFactory>::get();
-}
-
-MediaRouterImplFactory::MediaRouterImplFactory()
-    : BrowserContextKeyedServiceFactory(
-          "MediaRouterImpl",
-          BrowserContextDependencyManager::GetInstance()) {
-}
-
-MediaRouterImplFactory::~MediaRouterImplFactory() {
-}
-
-KeyedService* MediaRouterImplFactory::BuildServiceInstanceFor(
-    BrowserContext* context) const {
-  return new MediaRouterImpl;
-}
-
-BrowserContext* MediaRouterImplFactory::GetBrowserContextToUse(
-    BrowserContext* context) const {
-  // This means MediaRouterImpl is available in incognito contexts as well.
-  return context;
-}
-
-}  // namespace media_router

chrome/browser/media/router/media_router_impl_factory.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_IMPL_FACTORY_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_IMPL_FACTORY_H_
-
-#include "base/memory/singleton.h"
-#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
-
-namespace content {
-class BrowserContext;
-}  // namespace content
-
-namespace media_router {
-
-class MediaRouterImpl;
-
-// A factory that returns a MediaRouter object for a given BrowserContext,
-// creating one lazily if needed.
-class MediaRouterImplFactory : public BrowserContextKeyedServiceFactory {
- public:
-  static MediaRouterImpl* GetMediaRouterForBrowserContext(
-      content::BrowserContext* context);
-  static MediaRouterImplFactory* GetInstance();
-
- private:
-  friend struct DefaultSingletonTraits<MediaRouterImplFactory>;
-
-  MediaRouterImplFactory();
-  ~MediaRouterImplFactory() override;
-
-  // BrowserContextKeyedBaseFactory
-  KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const override;
-  content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaRouterImplFactory);
-};
-
-}  // namespace media_router
-
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_IMPL_FACTORY_H_