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

chrome/browser/ui/location_bar/location_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/location_bar/location_bar.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 40 matching lines @@
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // Load an extension with a PageAction that sends a message when clicked.
   const extensions::Extension* LoadPageActionExtension(
       extensions::TestExtensionDir* dir);
 
  private:
   std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_override_;
   std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> disable_redesign_;
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride>
-      disable_media_router_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarBrowserTest);
 };
 
 void LocationBarBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   // In order to let a vanilla extension override the bookmark star, we have to
   // enable the switch.
   enable_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::enable_override_bookmarks_ui(), true));
-  // We need to disable Media Router since having Media Router enabled will
-  // result in auto-enabling the redesign and breaking the test.
-  disable_media_router_.reset(new extensions::FeatureSwitch::ScopedOverride(
-      extensions::FeatureSwitch::media_router(), false));
   // For testing page actions in the location bar, we also have to be sure to
   // *not* have the redesign turned on.
   disable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
       extensions::FeatureSwitch::extension_action_redesign(), false));
   ExtensionBrowserTest::SetUpCommandLine(command_line);
 }
 
 const extensions::Extension* LocationBarBrowserTest::LoadPageActionExtension(
     extensions::TestExtensionDir* dir) {
   DCHECK(dir);
@@ skipping 134 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   int tab_id = SessionTabHelper::IdForTab(tab);
   action->SetIsVisible(tab_id, true);
   extensions::ExtensionActionAPI::Get(profile())->NotifyChange(
       action, tab, profile());
 
   // We should still have no page actions.
   EXPECT_EQ(0, location_bar->PageActionCount());
   EXPECT_EQ(0, location_bar->PageActionVisibleCount());
 }