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 #include "webkit/support/webkit_support.h" | 5 #include "content/test/webkit_support.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "content/test/test_webkit_platform_support.h" |
9 #include "third_party/WebKit/public/web/WebCache.h" | 10 #include "third_party/WebKit/public/web/WebCache.h" |
10 #include "third_party/WebKit/public/web/WebKit.h" | 11 #include "third_party/WebKit/public/web/WebKit.h" |
11 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 12 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
12 #include "url/url_util.h" | 13 #include "url/url_util.h" |
13 #include "webkit/common/user_agent/user_agent.h" | 14 #include "webkit/common/user_agent/user_agent.h" |
14 #include "webkit/common/user_agent/user_agent_util.h" | 15 #include "webkit/common/user_agent/user_agent_util.h" |
15 #include "webkit/support/test_webkit_platform_support.h" | |
16 | 16 |
17 #if defined(OS_ANDROID) | 17 #if defined(OS_ANDROID) |
18 #include "base/android/jni_android.h" | 18 #include "base/android/jni_android.h" |
19 #include "net/android/network_library.h" | 19 #include "net/android/network_library.h" |
20 #endif | 20 #endif |
21 | 21 |
22 #if defined(OS_MACOSX) | 22 #if defined(OS_MACOSX) |
23 #include "base/test/mock_chrome_application_mac.h" | 23 #include "base/test/mock_chrome_application_mac.h" |
24 #endif | 24 #endif |
25 | 25 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 base::RunLoop().RunUntilIdle(); | 85 base::RunLoop().RunUntilIdle(); |
86 | 86 |
87 if (RunningOnValgrind()) | 87 if (RunningOnValgrind()) |
88 WebKit::WebCache::clear(); | 88 WebKit::WebCache::clear(); |
89 WebKit::shutdown(); | 89 WebKit::shutdown(); |
90 delete test_environment; | 90 delete test_environment; |
91 test_environment = NULL; | 91 test_environment = NULL; |
92 } | 92 } |
93 | 93 |
94 } // namespace webkit_support | 94 } // namespace webkit_support |
OLD | NEW |