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 "content/shell/webkit_test_controller.h" | 5 #include "content/shell/browser/webkit_test_controller.h" |
6 | 6 |
7 #include <iostream> | 7 #include <iostream> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
15 #include "content/public/browser/devtools_manager.h" | 15 #include "content/public/browser/devtools_manager.h" |
16 #include "content/public/browser/gpu_data_manager.h" | 16 #include "content/public/browser/gpu_data_manager.h" |
17 #include "content/public/browser/navigation_controller.h" | 17 #include "content/public/browser/navigation_controller.h" |
18 #include "content/public/browser/navigation_entry.h" | 18 #include "content/public/browser/navigation_entry.h" |
19 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
20 #include "content/public/browser/notification_types.h" | 20 #include "content/public/browser/notification_types.h" |
21 #include "content/public/browser/render_process_host.h" | 21 #include "content/public/browser/render_process_host.h" |
22 #include "content/public/browser/render_view_host.h" | 22 #include "content/public/browser/render_view_host.h" |
23 #include "content/public/browser/render_widget_host_view.h" | 23 #include "content/public/browser/render_widget_host_view.h" |
24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
25 #include "content/public/browser/web_contents_view.h" | 25 #include "content/public/browser/web_contents_view.h" |
26 #include "content/public/common/content_switches.h" | 26 #include "content/public/common/content_switches.h" |
| 27 #include "content/shell/browser/shell.h" |
| 28 #include "content/shell/browser/shell_browser_context.h" |
| 29 #include "content/shell/browser/shell_content_browser_client.h" |
27 #include "content/shell/common/shell_messages.h" | 30 #include "content/shell/common/shell_messages.h" |
28 #include "content/shell/common/shell_switches.h" | 31 #include "content/shell/common/shell_switches.h" |
29 #include "content/shell/common/webkit_test_helpers.h" | 32 #include "content/shell/common/webkit_test_helpers.h" |
30 #include "content/shell/shell.h" | |
31 #include "content/shell/shell_browser_context.h" | |
32 #include "content/shell/shell_content_browser_client.h" | |
33 #include "ui/gfx/codec/png_codec.h" | 33 #include "ui/gfx/codec/png_codec.h" |
34 | 34 |
35 namespace content { | 35 namespace content { |
36 | 36 |
37 const int kTestSVGWindowWidthDip = 480; | 37 const int kTestSVGWindowWidthDip = 480; |
38 const int kTestSVGWindowHeightDip = 360; | 38 const int kTestSVGWindowHeightDip = 360; |
39 | 39 |
40 // WebKitTestResultPrinter ---------------------------------------------------- | 40 // WebKitTestResultPrinter ---------------------------------------------------- |
41 | 41 |
42 WebKitTestResultPrinter::WebKitTestResultPrinter( | 42 WebKitTestResultPrinter::WebKitTestResultPrinter( |
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 } | 623 } |
624 base::MessageLoop::current()->RunUntilIdle(); | 624 base::MessageLoop::current()->RunUntilIdle(); |
625 } | 625 } |
626 | 626 |
627 void WebKitTestController::OnResetDone() { | 627 void WebKitTestController::OnResetDone() { |
628 base::MessageLoop::current()->PostTask(FROM_HERE, | 628 base::MessageLoop::current()->PostTask(FROM_HERE, |
629 base::MessageLoop::QuitClosure()); | 629 base::MessageLoop::QuitClosure()); |
630 } | 630 } |
631 | 631 |
632 } // namespace content | 632 } // namespace content |
OLD | NEW |