| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "content/public/browser/worker_service_observer.h" | 45 #include "content/public/browser/worker_service_observer.h" |
| 46 #include "content/public/common/content_switches.h" | 46 #include "content/public/common/content_switches.h" |
| 47 #include "content/public/test/browser_test_utils.h" | 47 #include "content/public/test/browser_test_utils.h" |
| 48 #include "extensions/browser/extension_registry.h" | 48 #include "extensions/browser/extension_registry.h" |
| 49 #include "extensions/browser/extension_system.h" | 49 #include "extensions/browser/extension_system.h" |
| 50 #include "extensions/browser/notification_types.h" | 50 #include "extensions/browser/notification_types.h" |
| 51 #include "extensions/common/switches.h" | 51 #include "extensions/common/switches.h" |
| 52 #include "net/socket/tcp_listen_socket.h" | 52 #include "net/socket/tcp_listen_socket.h" |
| 53 #include "net/test/spawned_test_server/spawned_test_server.h" | 53 #include "net/test/spawned_test_server/spawned_test_server.h" |
| 54 | 54 |
| 55 using app_modal::AppModalDialog; |
| 56 using app_modal::JavaScriptAppModalDialog; |
| 57 using app_modal::NativeAppModalDialog; |
| 55 using content::BrowserThread; | 58 using content::BrowserThread; |
| 56 using content::DevToolsAgentHost; | 59 using content::DevToolsAgentHost; |
| 57 using content::NavigationController; | 60 using content::NavigationController; |
| 58 using content::RenderViewHost; | 61 using content::RenderViewHost; |
| 59 using content::WebContents; | 62 using content::WebContents; |
| 60 using content::WorkerService; | 63 using content::WorkerService; |
| 61 using content::WorkerServiceObserver; | 64 using content::WorkerServiceObserver; |
| 62 | 65 |
| 63 namespace { | 66 namespace { |
| 64 | 67 |
| (...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 #endif | 943 #endif |
| 941 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, MAYBE_RemoteDebugger) { | 944 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, MAYBE_RemoteDebugger) { |
| 942 #if defined(OS_WIN) && defined(USE_ASH) | 945 #if defined(OS_WIN) && defined(USE_ASH) |
| 943 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 946 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 944 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 947 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 945 return; | 948 return; |
| 946 #endif | 949 #endif |
| 947 | 950 |
| 948 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 951 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 949 } | 952 } |
| OLD | NEW |