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

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

Issue 2742623002: DevTools: improve test infrastructure w/ devtools driving the test (Closed)
Patch Set: fixup Created 3 years, 9 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
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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 // overridden with prefs_. 260 // overridden with prefs_.
261 bool should_override_prefs_; 261 bool should_override_prefs_;
262 WebPreferences prefs_; 262 WebPreferences prefs_;
263 263
264 NotificationRegistrar registrar_; 264 NotificationRegistrar registrar_;
265 265
266 const bool is_leak_detection_enabled_; 266 const bool is_leak_detection_enabled_;
267 bool crash_when_leak_found_; 267 bool crash_when_leak_found_;
268 268
269 LayoutTestDevToolsFrontend* devtools_frontend_; 269 LayoutTestDevToolsFrontend* devtools_frontend_;
270 Shell* inspected_window_;
dgozman 2017/03/10 00:17:17 Where do we clean this up? Or does it stay forever
270 271
271 std::unique_ptr<LayoutTestBluetoothChooserFactory> bluetooth_chooser_factory_; 272 std::unique_ptr<LayoutTestBluetoothChooserFactory> bluetooth_chooser_factory_;
272 273
273 // Map from frame_tree_node_id into frame-specific dumps. 274 // Map from frame_tree_node_id into frame-specific dumps.
274 std::map<int, std::string> frame_to_layout_dump_map_; 275 std::map<int, std::string> frame_to_layout_dump_map_;
275 // Number of ShellViewHostMsg_LayoutDumpResponse messages we are waiting for. 276 // Number of ShellViewHostMsg_LayoutDumpResponse messages we are waiting for.
276 int pending_layout_dumps_; 277 int pending_layout_dumps_;
277 278
278 // Renderer processes are observed to detect crashes. 279 // Renderer processes are observed to detect crashes.
279 ScopedObserver<RenderProcessHost, RenderProcessHostObserver> 280 ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
(...skipping 14 matching lines...) Expand all
294 // waiting on the UI thread while layout tests are being ran. 295 // waiting on the UI thread while layout tests are being ran.
295 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 296 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
296 #endif 297 #endif
297 298
298 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); 299 DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
299 }; 300 };
300 301
301 } // namespace content 302 } // namespace content
302 303
303 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 304 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698