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

Side by Side Diff: content/shell/browser/layout_test/blink_test_controller.h

Issue 2942573003: [DevTools] New harness for inspector-protocol layout tests (Closed)
Patch Set: Protocol -> dp Created 3 years, 6 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
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/browser/layout_test/blink_test_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 229
229 std::unique_ptr<BlinkTestResultPrinter> printer_; 230 std::unique_ptr<BlinkTestResultPrinter> printer_;
230 231
231 base::FilePath current_working_directory_; 232 base::FilePath current_working_directory_;
232 base::FilePath temp_path_; 233 base::FilePath temp_path_;
233 234
234 Shell* main_window_; 235 Shell* main_window_;
235 Shell* devtools_window_; 236 Shell* devtools_window_;
236 237
237 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_; 238 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_;
239 std::unique_ptr<DevToolsProtocolTestBindings>
240 devtools_protocol_test_bindings_;
238 241
239 // The PID of the render process of the render view host of main_window_. 242 // The PID of the render process of the render view host of main_window_.
240 int current_pid_; 243 int current_pid_;
241 244
242 // Tracks if (during the current test) we have already sent *initial* test 245 // Tracks if (during the current test) we have already sent *initial* test
243 // configuration to a renderer process (*initial* test configuration is 246 // configuration to a renderer process (*initial* test configuration is
244 // associated with some steps that should only be executed *once* per test - 247 // associated with some steps that should only be executed *once* per test -
245 // for example resizing the window and setting the focus). 248 // for example resizing the window and setting the focus).
246 bool did_send_initial_test_configuration_; 249 bool did_send_initial_test_configuration_;
247 250
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 #endif 302 #endif
300 303
301 SEQUENCE_CHECKER(sequence_checker_); 304 SEQUENCE_CHECKER(sequence_checker_);
302 305
303 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); 306 DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
304 }; 307 };
305 308
306 } // namespace content 309 } // namespace content
307 310
308 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 311 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/browser/layout_test/blink_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698