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 #include "content/test/webkit_support.h" | 5 #include "content/test/webkit_support.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "base/strings/string_tokenizer.h" | 13 #include "base/strings/string_tokenizer.h" |
14 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
| 15 #include "content/public/common/user_agent.h" |
15 #include "content/test/test_webkit_platform_support.h" | 16 #include "content/test/test_webkit_platform_support.h" |
16 #include "third_party/WebKit/public/web/WebCache.h" | 17 #include "third_party/WebKit/public/web/WebCache.h" |
17 #include "third_party/WebKit/public/web/WebKit.h" | 18 #include "third_party/WebKit/public/web/WebKit.h" |
18 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 19 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
19 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
20 #include "url/url_util.h" | 21 #include "url/url_util.h" |
21 | 22 |
22 #if defined(OS_ANDROID) | 23 #if defined(OS_ANDROID) |
23 #include "base/android/jni_android.h" | 24 #include "base/android/jni_android.h" |
24 #include "net/android/network_library.h" | 25 #include "net/android/network_library.h" |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 // http://code.google.com/p/chromium/issues/detail?id=9500 | 116 // http://code.google.com/p/chromium/issues/detail?id=9500 |
116 base::RunLoop().RunUntilIdle(); | 117 base::RunLoop().RunUntilIdle(); |
117 | 118 |
118 if (RunningOnValgrind()) | 119 if (RunningOnValgrind()) |
119 blink::WebCache::clear(); | 120 blink::WebCache::clear(); |
120 delete test_environment; | 121 delete test_environment; |
121 test_environment = NULL; | 122 test_environment = NULL; |
122 } | 123 } |
123 | 124 |
124 } // namespace content | 125 } // namespace content |
OLD | NEW |