[Media Router] Enable MR by default now that it is at 100% in stable.

chrome/browser/extensions/extension_context_menu_model_unittest.cc

Index: chrome/browser/extensions/extension_context_menu_model_unittest.cc
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 0fff54e42261f6fe87e73297cf795039730e97dd..42d7200812b1840909a7750633e0fa22287a8dc8 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -342,9 +342,12 @@ TEST_F(ExtensionContextMenuModelTest, ExtensionItemTest) {
 // context menu without the toolbar redesign.
 TEST_F(ExtensionContextMenuModelTest, ExtensionContextMenuShowAndHideLegacy) {
   // Start with the toolbar redesign disabled.
-  std::unique_ptr<FeatureSwitch::ScopedOverride> toolbar_redesign_override(
-      new FeatureSwitch::ScopedOverride(
-          FeatureSwitch::extension_action_redesign(), false));
+  // Disable Media Router first, since Extension Action Redesign would be force

[Devlin, 2016/09/08 22:03:13]

It might be out of scope for this change, but can we remove the logic to link
these switches now that they are both default-enabled?

[imcheng, 2016/09/09 16:51:24]

Sure, it should be a pretty small and harmless change (now that both are enabled
by default)

+  // enabled otherwise.
+  FeatureSwitch::ScopedOverride enable_media_router(
+      extensions::FeatureSwitch::media_router(), false);
+  FeatureSwitch::ScopedOverride toolbar_redesign_override(
+      FeatureSwitch::extension_action_redesign(), false);
 
   InitializeEmptyExtensionService();
   Browser* browser = GetBrowser();