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

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

Issue 2307803002: [Media Router] Enable MR by default now that it is at 100% in stable. (Closed)
Patch Set: Add MR FeatureSwitch to failing test cases Created 4 years, 3 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/toolbar/toolbar_actions_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
index 609619857d7f0318b4ecaa7027dfcd1de78f1a0a..54463c441e06bef29bbf4182862c6e20df6e2ec9 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -902,6 +902,10 @@ TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarSizeAfterPrefChange) {
// Test that, in the absence of the extension-action-redesign switch, the
// model only contains extensions with browser actions and component actions.
TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesDisabledSwitch) {
+ // Disable Media Router first, since Extension Action Redesign would be force
+ // enabled otherwise.
+ extensions::FeatureSwitch::ScopedOverride enable_media_router(
+ extensions::FeatureSwitch::media_router(), false);
extensions::FeatureSwitch::ScopedOverride enable_redesign(
extensions::FeatureSwitch::extension_action_redesign(), false);
Init();
@@ -970,6 +974,10 @@ TEST_F(ToolbarActionsModelUnitTest, TestToolbarExtensionTypesEnabledSwitch) {
// Test that hiding actions on the toolbar results in their removal from the
// model when the redesign switch is not enabled.
TEST_F(ToolbarActionsModelUnitTest, ActionsToolbarActionsVisibilityNoSwitch) {
+ // Disable Media Router first, since Extension Action Redesign would be force
+ // enabled otherwise.
+ extensions::FeatureSwitch::ScopedOverride enable_media_router(
+ extensions::FeatureSwitch::media_router(), false);
extensions::FeatureSwitch::ScopedOverride enable_redesign(
extensions::FeatureSwitch::extension_action_redesign(), false);
Init();

Powered by Google App Engine
This is Rietveld 408576698