| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/cancelable_callback.h" | 6 #include "base/cancelable_callback.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 869 #if defined(OS_WIN) && defined(USE_ASH) | 869 #if defined(OS_WIN) && defined(USE_ASH) |
| 870 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 870 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 871 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 871 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 872 return; | 872 return; |
| 873 #endif | 873 #endif |
| 874 | 874 |
| 875 RunTest("testSharedWorker", kSharedWorkerTestPage); | 875 RunTest("testSharedWorker", kSharedWorkerTestPage); |
| 876 } | 876 } |
| 877 | 877 |
| 878 // http://crbug.com/100538 | 878 // http://crbug.com/100538 |
| 879 #if defined(OS_MACOSX) || defined(OS_WIN) | |
| 880 #define MAYBE_PauseInSharedWorkerInitialization DISABLED_PauseInSharedWorkerInit
ialization | |
| 881 #else | |
| 882 #define MAYBE_PauseInSharedWorkerInitialization PauseInSharedWorkerInitializatio
n | |
| 883 #endif | |
| 884 | |
| 885 // http://crbug.com/106114 is masking | |
| 886 // MAYBE_PauseInSharedWorkerInitialization into | |
| 887 // DISABLED_PauseInSharedWorkerInitialization | |
| 888 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, | 879 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, |
| 889 MAYBE_PauseInSharedWorkerInitialization) { | 880 DISABLED_PauseInSharedWorkerInitialization) { |
| 890 ASSERT_TRUE(test_server()->Start()); | 881 ASSERT_TRUE(test_server()->Start()); |
| 891 GURL url = test_server()->GetURL(kReloadSharedWorkerTestPage); | 882 GURL url = test_server()->GetURL(kReloadSharedWorkerTestPage); |
| 892 ui_test_utils::NavigateToURL(browser(), url); | 883 ui_test_utils::NavigateToURL(browser(), url); |
| 893 | 884 |
| 894 scoped_refptr<WorkerData> worker_data = WaitForFirstSharedWorker(); | 885 scoped_refptr<WorkerData> worker_data = WaitForFirstSharedWorker(); |
| 895 OpenDevToolsWindowForSharedWorker(worker_data.get()); | 886 OpenDevToolsWindowForSharedWorker(worker_data.get()); |
| 896 | 887 |
| 897 TerminateWorker(worker_data); | 888 TerminateWorker(worker_data); |
| 898 | 889 |
| 899 // Reload page to restart the worker. | 890 // Reload page to restart the worker. |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 934 | 925 |
| 935 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { | 926 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { |
| 936 #if defined(OS_WIN) && defined(USE_ASH) | 927 #if defined(OS_WIN) && defined(USE_ASH) |
| 937 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 928 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 938 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 929 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 939 return; | 930 return; |
| 940 #endif | 931 #endif |
| 941 | 932 |
| 942 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 933 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 943 } | 934 } |
| OLD | NEW |