| Index: chrome/browser/extensions/extension_keybinding_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
|
| index f27477750262d228de2c3ed43ba3c1afcd4d1b3b..664315f5d9ae756f1689bc0a3e799c0886fa4fae 100644
|
| --- a/chrome/browser/extensions/extension_keybinding_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
|
| @@ -152,31 +152,17 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_PageAction) {
|
| ASSERT_TRUE(result);
|
| }
|
|
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| -// TODO(erg): linux_aura bringup: http://crbug.com/163931
|
| -#define MAYBE_SynthesizedCommand DISABLED_SynthesizedCommand
|
| -#else
|
| -#define MAYBE_SynthesizedCommand SynthesizedCommand
|
| -#endif
|
| -
|
| // This test validates that the getAll query API function returns registered
|
| // commands as well as synthesized ones and that inactive commands (like the
|
| // synthesized ones are in nature) have no shortcuts.
|
| -IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_SynthesizedCommand) {
|
| +IN_PROC_BROWSER_TEST_F(CommandsApiTest, SynthesizedCommand) {
|
| ASSERT_TRUE(test_server()->Start());
|
| ASSERT_TRUE(RunExtensionTest("keybinding/synthesized")) << message_;
|
| }
|
|
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| -// TODO(erg): linux_aura bringup: http://crbug.com/163931
|
| -#define MAYBE_DontOverwriteSystemShortcuts DISABLED_DontOverwriteSystemShortcuts
|
| -#else
|
| -#define MAYBE_DontOverwriteSystemShortcuts DontOverwriteSystemShortcuts
|
| -#endif
|
| -
|
| // This test validates that an extension cannot request a shortcut that is
|
| // already in use by Chrome.
|
| -IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_DontOverwriteSystemShortcuts) {
|
| +IN_PROC_BROWSER_TEST_F(CommandsApiTest, DontOverwriteSystemShortcuts) {
|
| ASSERT_TRUE(test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
|
|