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

Unified Diff: chrome/browser/extensions/api/declarative_content/declarative_content_apitest.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/about_flags.cc ('k') | chrome/browser/extensions/extension_context_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
index cc2363c71735a05ececc233075e79353944b6609..d4934900be02ae2cd8575916e6035b20771e3c1b 100644
--- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
+++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
@@ -749,20 +749,12 @@ class ShowPageActionWithoutPageActionTest : public DeclarativeContentApiTest {
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);
};
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/extension_context_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698