OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WEBKIT_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
6 #define CONTENT_SHELL_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 |
11 #include "base/cancelable_callback.h" | 11 #include "base/cancelable_callback.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/synchronization/lock.h" | 13 #include "base/synchronization/lock.h" |
14 #include "base/threading/non_thread_safe.h" | 14 #include "base/threading/non_thread_safe.h" |
15 #include "content/public/browser/gpu_data_manager_observer.h" | 15 #include "content/public/browser/gpu_data_manager_observer.h" |
16 #include "content/public/browser/notification_observer.h" | 16 #include "content/public/browser/notification_observer.h" |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 // Because of the nested message pump implementation, Android needs to allow | 209 // Because of the nested message pump implementation, Android needs to allow |
210 // waiting on the UI thread while layout tests are being ran. | 210 // waiting on the UI thread while layout tests are being ran. |
211 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 211 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
212 #endif | 212 #endif |
213 | 213 |
214 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 214 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
215 }; | 215 }; |
216 | 216 |
217 } // namespace content | 217 } // namespace content |
218 | 218 |
219 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ | 219 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
OLD | NEW |