| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <ostream> | 10 #include <ostream> |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "ui/gfx/geometry/size.h" | 31 #include "ui/gfx/geometry/size.h" |
| 32 | 32 |
| 33 #if defined(OS_ANDROID) | 33 #if defined(OS_ANDROID) |
| 34 #include "base/threading/thread_restrictions.h" | 34 #include "base/threading/thread_restrictions.h" |
| 35 #endif | 35 #endif |
| 36 | 36 |
| 37 class SkBitmap; | 37 class SkBitmap; |
| 38 | 38 |
| 39 namespace content { | 39 namespace content { |
| 40 | 40 |
| 41 class DevToolsProtocolTestBindings; |
| 41 class LayoutTestBluetoothChooserFactory; | 42 class LayoutTestBluetoothChooserFactory; |
| 42 class LayoutTestDevToolsBindings; | 43 class LayoutTestDevToolsBindings; |
| 43 class RenderFrameHost; | 44 class RenderFrameHost; |
| 44 class RenderProcessHost; | 45 class RenderProcessHost; |
| 45 class Shell; | 46 class Shell; |
| 46 | 47 |
| 47 #if defined(OS_ANDROID) | 48 #if defined(OS_ANDROID) |
| 48 // Android uses a nested run loop for running layout tests because the | 49 // Android uses a nested run loop for running layout tests because the |
| 49 // default message loop, provided by the system, does not offer a blocking | 50 // default message loop, provided by the system, does not offer a blocking |
| 50 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid, | 51 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid, |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 std::unique_ptr<BlinkTestResultPrinter> printer_; | 234 std::unique_ptr<BlinkTestResultPrinter> printer_; |
| 234 | 235 |
| 235 base::FilePath current_working_directory_; | 236 base::FilePath current_working_directory_; |
| 236 base::FilePath temp_path_; | 237 base::FilePath temp_path_; |
| 237 | 238 |
| 238 Shell* main_window_; | 239 Shell* main_window_; |
| 239 Shell* secondary_window_; | 240 Shell* secondary_window_; |
| 240 Shell* devtools_window_; | 241 Shell* devtools_window_; |
| 241 | 242 |
| 242 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_; | 243 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_; |
| 244 std::unique_ptr<DevToolsProtocolTestBindings> |
| 245 devtools_protocol_test_bindings_; |
| 243 | 246 |
| 244 // The PID of the render process of the render view host of main_window_. | 247 // The PID of the render process of the render view host of main_window_. |
| 245 int current_pid_; | 248 int current_pid_; |
| 246 | 249 |
| 247 // Tracks if (during the current test) we have already sent *initial* test | 250 // Tracks if (during the current test) we have already sent *initial* test |
| 248 // configuration to a renderer process (*initial* test configuration is | 251 // configuration to a renderer process (*initial* test configuration is |
| 249 // associated with some steps that should only be executed *once* per test - | 252 // associated with some steps that should only be executed *once* per test - |
| 250 // for example resizing the window and setting the focus). | 253 // for example resizing the window and setting the focus). |
| 251 bool did_send_initial_test_configuration_; | 254 bool did_send_initial_test_configuration_; |
| 252 | 255 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 #endif | 307 #endif |
| 305 | 308 |
| 306 SEQUENCE_CHECKER(sequence_checker_); | 309 SEQUENCE_CHECKER(sequence_checker_); |
| 307 | 310 |
| 308 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); | 311 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); |
| 309 }; | 312 }; |
| 310 | 313 |
| 311 } // namespace content | 314 } // namespace content |
| 312 | 315 |
| 313 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 316 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| OLD | NEW |