| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/blink_test_environment.h" | 5 #include "content/test/blink_test_environment.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/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "base/strings/string_tokenizer.h" | 12 #include "base/strings/string_tokenizer.h" |
| 13 #include "base/test/test_discardable_memory_allocator.h" | 13 #include "base/test/test_discardable_memory_allocator.h" |
| 14 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" | 14 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" |
| 15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 16 #include "content/public/common/content_switches.h" | 16 #include "content/public/common/content_switches.h" |
| 17 #include "content/public/common/user_agent.h" | 17 #include "content/public/common/user_agent.h" |
| 18 #include "content/public/test/test_content_client_initializer.h" | 18 #include "content/public/test/test_content_client_initializer.h" |
| 19 #include "content/test/test_blink_web_unit_test_support.h" | 19 #include "content/test/test_blink_web_unit_test_support.h" |
| 20 #include "third_party/WebKit/public/platform/WebRuntimeFeatures.h" |
| 20 #include "third_party/WebKit/public/web/WebCache.h" | 21 #include "third_party/WebKit/public/web/WebCache.h" |
| 21 #include "third_party/WebKit/public/web/WebKit.h" | 22 #include "third_party/WebKit/public/web/WebKit.h" |
| 22 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | |
| 23 #include "url/url_util.h" | 23 #include "url/url_util.h" |
| 24 | 24 |
| 25 #if defined(OS_WIN) | 25 #if defined(OS_WIN) |
| 26 #include "ui/gfx/win/dpi.h" | 26 #include "ui/gfx/win/dpi.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 #if defined(OS_ANDROID) | 29 #if defined(OS_ANDROID) |
| 30 #include "base/android/jni_android.h" | 30 #include "base/android/jni_android.h" |
| 31 #include "net/android/network_library.h" | 31 #include "net/android/network_library.h" |
| 32 #endif | 32 #endif |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 // http://code.google.com/p/chromium/issues/detail?id=9500 | 123 // http://code.google.com/p/chromium/issues/detail?id=9500 |
| 124 base::RunLoop().RunUntilIdle(); | 124 base::RunLoop().RunUntilIdle(); |
| 125 | 125 |
| 126 if (RunningOnValgrind()) | 126 if (RunningOnValgrind()) |
| 127 blink::WebCache::clear(); | 127 blink::WebCache::clear(); |
| 128 delete test_environment; | 128 delete test_environment; |
| 129 test_environment = NULL; | 129 test_environment = NULL; |
| 130 } | 130 } |
| 131 | 131 |
| 132 } // namespace content | 132 } // namespace content |
| OLD | NEW |