chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc - Issue 2451573003: [Media Router] Update Media Router flags post-launch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.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

« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc ('k') | chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc

diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc b/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc

index 692f52b3136290b29949dfc70d507a9464e4c51a..d53cd68994c28902ba7e796fb964dd5cbe51a498 100644

--- a/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc

+++ b/chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc

@@ -30,10 +30,6 @@ class PageActionImageViewInteractiveUITest : public ExtensionBrowserTest {

void SetUpCommandLine(base::CommandLine* command_line) override {

ExtensionBrowserTest::SetUpCommandLine(command_line);

- // 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));

// Testing page action-specific UI means we need to disable the redesign.

disable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(

extensions::FeatureSwitch::extension_action_redesign(), false));

@@ -41,8 +37,6 @@ class PageActionImageViewInteractiveUITest : public ExtensionBrowserTest {

private:

std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> disable_redesign_;

- std::unique_ptr<extensions::FeatureSwitch::ScopedOverride>

- disable_media_router_;

DISALLOW_COPY_AND_ASSIGN(PageActionImageViewInteractiveUITest);

};