| 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(
|
|
|