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

chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 884 matching lines @@
   EXPECT_EQ(num_toolbar_items(), toolbar_model()->visible_icon_count());
   toolbar_model()->OnActionToolbarPrefChange();
   // Should still be at max size.
   EXPECT_TRUE(toolbar_model()->all_icons_visible());
   EXPECT_EQ(num_toolbar_items(), toolbar_model()->visible_icon_count());
 }
 
 // Test that, in the absence of the extension-action-redesign switch, the
 // model only contains extensions with browser actions and component actions.
 TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesDisabledSwitch) {
+  // Disable Media Router first, since Extension Action Redesign would be force
+  // enabled otherwise.
+  extensions::FeatureSwitch::ScopedOverride enable_media_router(
+      extensions::FeatureSwitch::media_router(), false);
   extensions::FeatureSwitch::ScopedOverride enable_redesign(
       extensions::FeatureSwitch::extension_action_redesign(), false);
   Init();
   ASSERT_TRUE(AddActionExtensions());
 
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action()->id(), GetActionIdAtIndex(0u));
 }
 
 // Test that, with the extension-action-redesign switch, the model contains
@@ skipping 48 matching lines @@
           extensions::extension_action_test_util::NO_ACTION,
           extensions::Manifest::INTERNAL);
   EXPECT_TRUE(AddExtension(internal_extension_no_action.get()));
   EXPECT_EQ(4u, num_toolbar_items());
   EXPECT_TRUE(ModelHasActionForId(internal_extension_no_action->id()));
 }
 
 // Test that hiding actions on the toolbar results in their removal from the
 // model when the redesign switch is not enabled.
 TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarActionsVisibilityNoSwitch) {
+  // Disable Media Router first, since Extension Action Redesign would be force
+  // enabled otherwise.
+  extensions::FeatureSwitch::ScopedOverride enable_media_router(
+      extensions::FeatureSwitch::media_router(), false);
   extensions::FeatureSwitch::ScopedOverride enable_redesign(
       extensions::FeatureSwitch::extension_action_redesign(), false);
   Init();
 
   extensions::ExtensionActionAPI* action_api =
       extensions::ExtensionActionAPI::Get(profile());
 
   ASSERT_TRUE(AddBrowserActionExtensions());
   // Sanity check: Order should start as A , B, C.
   EXPECT_EQ(3u, num_toolbar_items());
@@ skipping 550 matching lines @@
 }
 
 TEST_F(ToolbarActionsModelUnitTest,
        MigrationToExtensionWithoutExtensionActionRedesign) {
   InitForMigrationTest(MigrationStatus::FEATURE_DISABLED_WITH_PREF_TRUE);
 
   // Initialization re-enables the extension.
   EXPECT_EQ(1u, num_toolbar_items());
   EXPECT_EQ(browser_action_migrated()->id(), GetActionIdAtIndex(0u));
 }