[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..afcd618b6f89b64cd6111e4af275fff6cda67fd3 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 {
@@ -45,7 +42,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
 #if defined(OS_ANDROID)
   return true;

[apacible, 2016/10/25 22:01:28]

L43 and L45 both return true -- can we consolidate these?

[mark a. foltz, 2016/10/25 22:56:36]

Done.

 #else  // defined(ENABLE_EXTENSIONS)
-  return extensions::FeatureSwitch::media_router()->IsEnabled();
+  return true;
 #endif  // defined(OS_ANDROID)
 #else  // !(defined(OS_ANDROID) || defined(ENABLE_EXTENSIONS))
   return false;