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

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.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/browser_actions_bar_browsertest.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 52 matching lines @@
     : toolbar_model_(nullptr) {
 }
 
 BrowserActionsBarBrowserTest::~BrowserActionsBarBrowserTest() {
 }
 
 void BrowserActionsBarBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   ToolbarActionsBar::disable_animations_for_testing_ = true;
-  // We need to disable Media Router since having Media Router enabled will
-  // result in auto-enabling the redesign and breaking the test.
-  override_media_router_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::media_router(), false));
   // These tests are deliberately testing behavior without the redesign.
   // Forcefully disable it.
   override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::extension_action_redesign(), true));
 }
 
 void BrowserActionsBarBrowserTest::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
   browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));
   toolbar_model_ = ToolbarActionsModel::Get(profile());
@@ skipping 546 matching lines @@
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
   ASSERT_TRUE(toolbar_actions_bar->popped_out_action());
   EXPECT_EQ(extension3->id(),
             toolbar_actions_bar->popped_out_action()->GetId());
   extension_service()->UnloadExtension(
       extension3->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
 }