Commit 4f24f3e1 authored by Bret Sepulveda's avatar Bret Sepulveda Committed by Commit Bot

Fix ExtensionContextMenuModelTest.ExtensionContextMenuShowAndHide.

When ExtensionsToolbarMenu is enabled, the test was failing because it
was expecting a "Hide in Chrome menu" label, rather than the new "Unpin"
label. This patch fixes that expectation.

Bug: 984654
Change-Id: I146d84522beaef09337799260f6e7dc051f5a70c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942344
Auto-Submit: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722426}
parent 44953bde
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <utility> #include <utility>
#include "base/bind.h" #include "base/bind.h"
#include "base/feature_list.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
#include "chrome/browser/extensions/scripting_permissions_modifier.h" #include "chrome/browser/extensions/scripting_permissions_modifier.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/common/extensions/api/context_menus.h" #include "chrome/common/extensions/api/context_menus.h"
#include "chrome/grit/chromium_strings.h" #include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
...@@ -636,7 +638,8 @@ TEST_F(ExtensionContextMenuModelTest, ...@@ -636,7 +638,8 @@ TEST_F(ExtensionContextMenuModelTest,
} }
// Test that the "show" and "hide" menu items appear correctly in the extension // Test that the "show" and "hide" menu items appear correctly in the extension
// context menu. // context menu. When kExtensionsToolbarMenu is enabled, the "hide" is instead
// an "unpin" menu item.
TEST_F(ExtensionContextMenuModelTest, ExtensionContextMenuShowAndHide) { TEST_F(ExtensionContextMenuModelTest, ExtensionContextMenuShowAndHide) {
InitializeEmptyExtensionService(); InitializeEmptyExtensionService();
Browser* browser = GetBrowser(); Browser* browser = GetBrowser();
...@@ -653,8 +656,10 @@ TEST_F(ExtensionContextMenuModelTest, ExtensionContextMenuShowAndHide) { ...@@ -653,8 +656,10 @@ TEST_F(ExtensionContextMenuModelTest, ExtensionContextMenuShowAndHide) {
// For laziness. // For laziness.
const ExtensionContextMenuModel::MenuEntries visibility_command = const ExtensionContextMenuModel::MenuEntries visibility_command =
ExtensionContextMenuModel::TOGGLE_VISIBILITY; ExtensionContextMenuModel::TOGGLE_VISIBILITY;
base::string16 hide_string = base::string16 hide_string = l10n_util::GetStringUTF16(
l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_BUTTON_IN_MENU); base::FeatureList::IsEnabled(features::kExtensionsToolbarMenu)
? IDS_EXTENSIONS_UNPIN_FROM_TOOLBAR
: IDS_EXTENSIONS_HIDE_BUTTON_IN_MENU);
base::string16 show_string = base::string16 show_string =
l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR); l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR);
base::string16 keep_string = base::string16 keep_string =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment