Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 467653002: Revert of [DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 19 matching lines...) Expand all
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
33 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
34 #include "chrome/test/base/in_process_browser_test.h" 34 #include "chrome/test/base/in_process_browser_test.h"
35 #include "chrome/test/base/test_switches.h" 35 #include "chrome/test/base/test_switches.h"
36 #include "chrome/test/base/ui_test_utils.h" 36 #include "chrome/test/base/ui_test_utils.h"
37 #include "content/public/browser/child_process_data.h" 37 #include "content/public/browser/child_process_data.h"
38 #include "content/public/browser/content_browser_client.h" 38 #include "content/public/browser/content_browser_client.h"
39 #include "content/public/browser/devtools_agent_host.h" 39 #include "content/public/browser/devtools_agent_host.h"
40 #include "content/public/browser/devtools_client_host.h"
40 #include "content/public/browser/devtools_http_handler.h" 41 #include "content/public/browser/devtools_http_handler.h"
42 #include "content/public/browser/devtools_manager.h"
41 #include "content/public/browser/notification_registrar.h" 43 #include "content/public/browser/notification_registrar.h"
42 #include "content/public/browser/notification_service.h" 44 #include "content/public/browser/notification_service.h"
43 #include "content/public/browser/render_view_host.h" 45 #include "content/public/browser/render_view_host.h"
44 #include "content/public/browser/web_contents.h" 46 #include "content/public/browser/web_contents.h"
45 #include "content/public/browser/worker_service.h" 47 #include "content/public/browser/worker_service.h"
46 #include "content/public/browser/worker_service_observer.h" 48 #include "content/public/browser/worker_service_observer.h"
47 #include "content/public/common/content_switches.h" 49 #include "content/public/common/content_switches.h"
48 #include "content/public/test/browser_test_utils.h" 50 #include "content/public/test/browser_test_utils.h"
49 #include "extensions/browser/extension_system.h" 51 #include "extensions/browser/extension_system.h"
50 #include "extensions/browser/notification_types.h" 52 #include "extensions/browser/notification_types.h"
51 #include "extensions/common/switches.h" 53 #include "extensions/common/switches.h"
52 #include "net/socket/tcp_listen_socket.h" 54 #include "net/socket/tcp_listen_socket.h"
53 #include "net/test/spawned_test_server/spawned_test_server.h" 55 #include "net/test/spawned_test_server/spawned_test_server.h"
54 56
55 using content::BrowserThread; 57 using content::BrowserThread;
58 using content::DevToolsManager;
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
65 const char kDebuggerTestPage[] = "files/devtools/debugger_test_page.html"; 68 const char kDebuggerTestPage[] = "files/devtools/debugger_test_page.html";
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 917
915 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { 918 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) {
916 #if defined(OS_WIN) && defined(USE_ASH) 919 #if defined(OS_WIN) && defined(USE_ASH)
917 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 920 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
918 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 921 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
919 return; 922 return;
920 #endif 923 #endif
921 924
922 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; 925 ASSERT_TRUE(RunExtensionTest("target_list")) << message_;
923 } 926 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/chrome_devtools_manager_delegate.cc ('k') | chrome/browser/devtools/devtools_ui_bindings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698