Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5732)

Unified Diff: chrome/browser/ui/location_bar/location_bar_browsertest.cc

Issue 2451573003: [Media Router] Update Media Router flags post-launch. (Closed)
Patch Set: Rebase & respond to apacible@ comments. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/location_bar/location_bar_browsertest.cc
diff --git a/chrome/browser/ui/location_bar/location_bar_browsertest.cc b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
index 1963f169d58792ef294dacf4e2b1b96a1e860280..7e5acaafb1c1b207a72bc724b25db6d27022ac84 100644
--- a/chrome/browser/ui/location_bar/location_bar_browsertest.cc
+++ b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
@@ -58,8 +58,6 @@ class LocationBarBrowserTest : public ExtensionBrowserTest {
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);
};
@@ -69,10 +67,6 @@ void LocationBarBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
// 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(

Powered by Google App Engine
This is Rietveld 408576698