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_WEBKIT_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
7 | 7 |
8 #include <ostream> | 8 #include <ostream> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 GURL test_url_; | 205 GURL test_url_; |
206 | 206 |
207 // True if the WebPreferences of newly created RenderViewHost should be | 207 // True if the WebPreferences of newly created RenderViewHost should be |
208 // overridden with prefs_. | 208 // overridden with prefs_. |
209 bool should_override_prefs_; | 209 bool should_override_prefs_; |
210 WebPreferences prefs_; | 210 WebPreferences prefs_; |
211 | 211 |
212 NotificationRegistrar registrar_; | 212 NotificationRegistrar registrar_; |
213 | 213 |
214 const bool is_leak_detection_enabled_; | 214 const bool is_leak_detection_enabled_; |
| 215 bool crash_when_leak_found_; |
215 | 216 |
216 #if defined(OS_ANDROID) | 217 #if defined(OS_ANDROID) |
217 // Because of the nested message pump implementation, Android needs to allow | 218 // Because of the nested message pump implementation, Android needs to allow |
218 // waiting on the UI thread while layout tests are being ran. | 219 // waiting on the UI thread while layout tests are being ran. |
219 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 220 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
220 #endif | 221 #endif |
221 | 222 |
222 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 223 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
223 }; | 224 }; |
224 | 225 |
225 } // namespace content | 226 } // namespace content |
226 | 227 |
227 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ | 228 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
OLD | NEW |