| 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 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 #if defined(OS_ANDROID) | 23 #if defined(OS_ANDROID) |
| 24 #include "base/threading/thread_restrictions.h" | 24 #include "base/threading/thread_restrictions.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 class SkBitmap; | 27 class SkBitmap; |
| 28 | 28 |
| 29 namespace content { | 29 namespace content { |
| 30 | 30 |
| 31 class Shell; | 31 class Shell; |
| 32 class ShellDevToolsFrontend; |
| 32 | 33 |
| 33 #if defined(OS_ANDROID) | 34 #if defined(OS_ANDROID) |
| 34 // Android uses a nested message loop for running layout tests because the | 35 // Android uses a nested message loop for running layout tests because the |
| 35 // default message loop, provided by the system, does not offer a blocking | 36 // default message loop, provided by the system, does not offer a blocking |
| 36 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid, | 37 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid, |
| 37 // uses a base::WaitableEvent allowing it to sleep until more events arrive. | 38 // uses a base::WaitableEvent allowing it to sleep until more events arrive. |
| 38 class ScopedAllowWaitForAndroidLayoutTests { | 39 class ScopedAllowWaitForAndroidLayoutTests { |
| 39 private: | 40 private: |
| 40 base::ThreadRestrictions::ScopedAllowWait wait; | 41 base::ThreadRestrictions::ScopedAllowWait wait; |
| 41 }; | 42 }; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 // True if the WebPreferences of newly created RenderViewHost should be | 208 // True if the WebPreferences of newly created RenderViewHost should be |
| 208 // overridden with prefs_. | 209 // overridden with prefs_. |
| 209 bool should_override_prefs_; | 210 bool should_override_prefs_; |
| 210 WebPreferences prefs_; | 211 WebPreferences prefs_; |
| 211 | 212 |
| 212 NotificationRegistrar registrar_; | 213 NotificationRegistrar registrar_; |
| 213 | 214 |
| 214 const bool is_leak_detection_enabled_; | 215 const bool is_leak_detection_enabled_; |
| 215 bool crash_when_leak_found_; | 216 bool crash_when_leak_found_; |
| 216 | 217 |
| 218 ShellDevToolsFrontend* devtools_frontend_; |
| 219 |
| 217 #if defined(OS_ANDROID) | 220 #if defined(OS_ANDROID) |
| 218 // Because of the nested message pump implementation, Android needs to allow | 221 // Because of the nested message pump implementation, Android needs to allow |
| 219 // waiting on the UI thread while layout tests are being ran. | 222 // waiting on the UI thread while layout tests are being ran. |
| 220 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 223 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 221 #endif | 224 #endif |
| 222 | 225 |
| 223 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 226 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
| 224 }; | 227 }; |
| 225 | 228 |
| 226 } // namespace content | 229 } // namespace content |
| 227 | 230 |
| 228 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ | 231 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
| OLD | NEW |