| Index: chrome/browser/extensions/chrome_mojo_service_registration.cc
|
| diff --git a/chrome/browser/extensions/chrome_mojo_service_registration.cc b/chrome/browser/extensions/chrome_mojo_service_registration.cc
|
| index dc6651b0242b06ed490aa02ab8e82d62e59562c9..8bf9799a7d69c4d859c7a81b2142d90f0ce4602a 100644
|
| --- a/chrome/browser/extensions/chrome_mojo_service_registration.cc
|
| +++ b/chrome/browser/extensions/chrome_mojo_service_registration.cc
|
| @@ -5,18 +5,16 @@
|
| #include "chrome/browser/extensions/chrome_mojo_service_registration.h"
|
|
|
| #include "base/bind.h"
|
| -#include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/common/service_registry.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/permissions/api_permission.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| -#include "extensions/common/switches.h"
|
|
|
| #if defined(ENABLE_MEDIA_ROUTER)
|
| +#include "chrome/browser/media/router/media_router_feature.h"
|
| #include "chrome/browser/media/router/media_router_mojo_impl.h"
|
| #endif
|
|
|
| @@ -28,8 +26,7 @@ void RegisterChromeServicesForFrame(content::RenderFrameHost* render_frame_host,
|
| DCHECK(extension);
|
|
|
| #if defined(ENABLE_MEDIA_ROUTER)
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ::switches::kEnableMediaRouter)) {
|
| + if (media_router::MediaRouterEnabled()) {
|
| if (extension->permissions_data()->HasAPIPermission(
|
| APIPermission::kMediaRouterPrivate)) {
|
| render_frame_host->GetServiceRegistry()->AddService(base::Bind(
|
|
|