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

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

Issue 2906723003: [Extenisons UI] Remove extension_action_redesign logic from the toolbar (Closed)
Patch Set: comments Created 3 years, 7 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_bar.cc ('k') | chrome/browser/ui/toolbar/toolbar_actions_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
index 84b8a6fc70e03925930f2ca3c392adb8e879738c..de8ac7947b7c0f606de3f1bbce83588427f31920 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc
@@ -25,7 +25,6 @@
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
-#include "extensions/common/feature_switch.h"
#include "ui/base/test/material_design_controller_test_api.h"
namespace {
@@ -115,10 +114,8 @@ void ToolbarActionsBarUnitTest::SetUp() {
ToolbarActionsBar::disable_animations_for_testing_ = true;
browser_action_test_util_.reset(new BrowserActionTestUtil(browser(), false));
- if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
- overflow_browser_action_test_util_ =
- browser_action_test_util_->CreateOverflowBar();
- }
+ overflow_browser_action_test_util_ =
+ browser_action_test_util_->CreateOverflowBar();
}
void ToolbarActionsBarUnitTest::TearDown() {
@@ -169,15 +166,9 @@ testing::AssertionResult ToolbarActionsBarUnitTest::VerifyToolbarOrder(
total_size,
visible_count);
std::string overflow_bar_error;
- if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
- overflow_bar_error =
- VerifyToolbarOrderForBar(overflow_bar(),
- overflow_browser_action_test_util(),
- expected_names,
- total_size,
- total_size - visible_count);
-
- }
+ overflow_bar_error = VerifyToolbarOrderForBar(
+ overflow_bar(), overflow_browser_action_test_util(), expected_names,
+ total_size, total_size - visible_count);
return main_bar_error.empty() && overflow_bar_error.empty() ?
testing::AssertionSuccess() :
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_bar.cc ('k') | chrome/browser/ui/toolbar/toolbar_actions_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698