Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_commands_global_registry_apitest.cc

diff --git a/src/chrome/browser/extensions/extension_commands_global_registry_apitest.cc b/src/chrome/browser/extensions/extension_commands_global_registry_apitest.cc
index d6c60f3..ff8fbb7 100644 (file)
--- a/src/chrome/browser/extensions/extension_commands_global_registry_apitest.cc
+++ b/src/chrome/browser/extensions/extension_commands_global_registry_apitest.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
+#include "extensions/test/result_catcher.h"
 #include "ui/base/base_window.h"
 #include "ui/base/test/ui_controls.h"
 
@@ -173,7 +174,8 @@ IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, GlobalCommand) {
 #if defined(OS_WIN)
 // Feature only fully implemented on Windows, other platforms coming.
 // TODO(smus): On mac, SendKeyPress must first support media keys.
-#define MAYBE_GlobalDuplicatedMediaKey GlobalDuplicatedMediaKey
+// Test occasionally times out on Windows. http://crbug.com/428813
+#define MAYBE_GlobalDuplicatedMediaKey DISABLED_GlobalDuplicatedMediaKey
 #else
 #define MAYBE_GlobalDuplicatedMediaKey DISABLED_GlobalDuplicatedMediaKey
 #endif