Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

chrome/browser/extensions/extension_keybinding_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 223 matching lines @@
   result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       tab,
       "setInterval(function() {"
       "  if (document.body.bgColor == 'blue') {"
       "    window.domAutomationController.send(true)}}, 100)",
       &result));
   ASSERT_TRUE(result);
 }
 
-#if defined(OS_WIN)
-// TODO(wittman): Enable the test once the bookmarks aren't a part of Settings
-// Overrides API.
-#define MAYBE_OverwriteBookmarkShortcut OverwriteBookmarkShortcut
-#else
-#define MAYBE_OverwriteBookmarkShortcut DISABLED_OverwriteBookmarkShortcut
-#endif
-
 // This test validates that an extension can override the Chrome bookmark
 // shortcut if it has requested to do so.
-IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_OverwriteBookmarkShortcut) {
+IN_PROC_BROWSER_TEST_F(CommandsApiTest, OverwriteBookmarkShortcut) {
   ASSERT_TRUE(test_server()->Start());
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // This functionality requires a feature flag.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       "--enable-override-bookmarks-ui",
       "1");
 
   ASSERT_TRUE(RunExtensionTest("keybinding/overwrite_bookmark_shortcut"))
@@ skipping 48 matching lines @@
   // Activate the Media Stop key.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_MEDIA_STOP, false, false, false, false));
 
   // We should get two success result.
   ASSERT_TRUE(catcher.GetNextResult());
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace extensions