[Media Router] Update Media Router flags post-launch.

chrome/browser/media/router/media_router_feature.cc

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 04a9958e5615cac3b2c5f6f14f12f28ffa45ab6e..a927294a91f2834340f268bff671e3ab7e44684d 100644
--- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc
@@ -13,9 +13,6 @@
 #include "components/prefs/pref_service.h"
 #include "components/user_prefs/user_prefs.h"
 #endif  // defined(OS_ANDROID) || defined(ENABLE_EXTENSIONS)
-#if defined(ENABLE_EXTENSIONS)
-#include "extensions/common/feature_switch.h"
-#endif // defined(ENABLE_EXTENSIONS)
 #endif  // defined(ENABLE_MEDIA_ROUTER)
 
 namespace media_router {
@@ -42,11 +39,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
     CHECK(pref->GetValue()->GetAsBoolean(&allowed));
     return allowed;
   }
-#if defined(OS_ANDROID)
   return true;
-#else  // defined(ENABLE_EXTENSIONS)
-  return extensions::FeatureSwitch::media_router()->IsEnabled();
-#endif  // defined(OS_ANDROID)
 #else  // !(defined(OS_ANDROID) || defined(ENABLE_EXTENSIONS))

[apacible, 2016/10/28 02:42:37]

Could we do:

#if defined(ENABLE_MEDIA_ROUTER) &&
    (defined(OS_ANDROID) || defined(ENABLE_EXTENSIONS))
  if (... prefs checks here..)
    return allowed;
  return true;
#endif
  return false;

[mark a. foltz, 2016/10/28 19:54:44]

I tried it, but it results in line wrapping the #ifdefs and was less readable
IMO.

   return false;
 #endif  // defined(OS_ANDROID) || defined(ENABLE_EXTENSIONS)