| Index: chrome/browser/media/router/media_router_feature.cc
|
| diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
|
| index d1a617ce836c93d6f09b5245532864509a87c1fd..5e636a39f4a110898c3df1b6e3ad9053c86fbb47 100644
|
| --- a/chrome/browser/media/router/media_router_feature.cc
|
| +++ b/chrome/browser/media/router/media_router_feature.cc
|
| @@ -8,17 +8,14 @@
|
| #include "content/public/browser/browser_context.h"
|
| #include "extensions/features/features.h"
|
|
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
|
| #include "chrome/common/pref_names.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| #endif // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
|
| -#endif // defined(ENABLE_MEDIA_ROUTER)
|
|
|
| namespace media_router {
|
|
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
|
| namespace {
|
| const PrefService::Preference* GetMediaRouterPref(
|
| @@ -28,10 +25,8 @@ const PrefService::Preference* GetMediaRouterPref(
|
| }
|
| } // namespace
|
| #endif // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
|
| -#endif // defined(ENABLE_MEDIA_ROUTER)
|
|
|
| bool MediaRouterEnabled(content::BrowserContext* context) {
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
|
| const PrefService::Preference* pref = GetMediaRouterPref(context);
|
| // Only use the pref value if it set from a mandatory policy.
|
| @@ -44,9 +39,6 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
|
| #else // !(defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS))
|
| return false;
|
| #endif // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
|
| -#else // !defined(ENABLE_MEDIA_ROUTER)
|
| - return false;
|
| -#endif // defined(ENABLE_MEDIA_ROUTER)
|
| }
|
|
|
| } // namespace media_router
|
|
|