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

chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 731 matching lines @@
         ExtensionActionManager::Get(browser()->profile())
             ->GetPageAction(*extension);
     EXPECT_EQ(expect_page_action, page_action != nullptr);
     EXPECT_EQ(expect_page_action ? 1u : 0u,
               extension_action_test_util::GetVisiblePageActionCount(tab));
   }
 
  private:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     DeclarativeContentApiTest::SetUpCommandLine(command_line);
-    // If disabling the redesign, we need to disable Media Router since having
-    // Media Router enabled will result in auto-enabling the redesign and
-    // breaking the test.
-    if (!enable_redesign_) {
-      override_media_router_.reset(new FeatureSwitch::ScopedOverride(
-          FeatureSwitch::media_router(), false));
-    }
     override_toolbar_redesign_.reset(new FeatureSwitch::ScopedOverride(
         FeatureSwitch::extension_action_redesign(), enable_redesign_));
   }
 
   bool enable_redesign_;
   std::unique_ptr<FeatureSwitch::ScopedOverride> override_toolbar_redesign_;
-  std::unique_ptr<FeatureSwitch::ScopedOverride> override_media_router_;
   DISALLOW_COPY_AND_ASSIGN(ShowPageActionWithoutPageActionTest);
 };
 
 class ShowPageActionWithoutPageActionLegacyTest
     : public ShowPageActionWithoutPageActionTest {
  protected:
   ShowPageActionWithoutPageActionLegacyTest()
       : ShowPageActionWithoutPageActionTest(false) {}
 };
 
@@ skipping 207 matching lines @@
 // action interfaces, add a test that checks that a navigation always evaluates
 // consistent URL state for all conditions. i.e.: if condition1 evaluates to
 // false on url0 and true on url1, and condition2 evaluates to true on url0 and
 // false on url1, navigate from url0 to url1 and validate that no action is
 // triggered. Do the same when navigating back to url0. This kind of test is
 // unfortunately not feasible with the current implementation and the existing
 // supported conditions and actions.
 
 }  // namespace
 }  // namespace extensions