| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 const std::string& argument); | 225 const std::string& argument); |
| 226 mojom::LayoutTestControl* GetLayoutTestControlPtr(RenderFrameHost* frame); | 226 mojom::LayoutTestControl* GetLayoutTestControlPtr(RenderFrameHost* frame); |
| 227 void HandleLayoutTestControlError(RenderFrameHost* frame); | 227 void HandleLayoutTestControlError(RenderFrameHost* frame); |
| 228 | 228 |
| 229 std::unique_ptr<BlinkTestResultPrinter> printer_; | 229 std::unique_ptr<BlinkTestResultPrinter> printer_; |
| 230 | 230 |
| 231 base::FilePath current_working_directory_; | 231 base::FilePath current_working_directory_; |
| 232 base::FilePath temp_path_; | 232 base::FilePath temp_path_; |
| 233 | 233 |
| 234 Shell* main_window_; | 234 Shell* main_window_; |
| 235 std::unique_ptr<Shell> devtools_window_; | 235 Shell* devtools_window_; |
| 236 | 236 |
| 237 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_; | 237 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_; |
| 238 | 238 |
| 239 // The PID of the render process of the render view host of main_window_. | 239 // The PID of the render process of the render view host of main_window_. |
| 240 int current_pid_; | 240 int current_pid_; |
| 241 | 241 |
| 242 // Tracks if (during the current test) we have already sent *initial* test | 242 // Tracks if (during the current test) we have already sent *initial* test |
| 243 // configuration to a renderer process (*initial* test configuration is | 243 // configuration to a renderer process (*initial* test configuration is |
| 244 // associated with some steps that should only be executed *once* per test - | 244 // associated with some steps that should only be executed *once* per test - |
| 245 // for example resizing the window and setting the focus). | 245 // for example resizing the window and setting the focus). |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 // waiting on the UI thread while layout tests are being ran. | 297 // waiting on the UI thread while layout tests are being ran. |
| 298 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 298 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 299 #endif | 299 #endif |
| 300 | 300 |
| 301 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); | 301 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); |
| 302 }; | 302 }; |
| 303 | 303 |
| 304 } // namespace content | 304 } // namespace content |
| 305 | 305 |
| 306 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 306 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| OLD | NEW |