Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Side by Side Diff: content/test/blink_test_environment.cc

Issue 2895413002: WebRuntimeFeatures moved to platform/ (Closed)
Patch Set: One more move Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/strings/string_tokenizer.h" 11 #include "base/strings/string_tokenizer.h"
12 #include "base/test/scoped_task_environment.h" 12 #include "base/test/scoped_task_environment.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/WebCache.h" 20 #include "third_party/WebKit/public/platform/WebCache.h"
21 #include "third_party/WebKit/public/platform/WebRuntimeFeatures.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/display/win/dpi.h" 26 #include "ui/display/win/dpi.h"
27 #endif 27 #endif
28 28
29 #if defined(OS_MACOSX) 29 #if defined(OS_MACOSX)
30 #include "base/test/mock_chrome_application_mac.h" 30 #include "base/test/mock_chrome_application_mac.h"
31 #endif 31 #endif
32 32
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // http://code.google.com/p/chromium/issues/detail?id=9500 88 // http://code.google.com/p/chromium/issues/detail?id=9500
89 base::RunLoop().RunUntilIdle(); 89 base::RunLoop().RunUntilIdle();
90 90
91 if (RunningOnValgrind()) 91 if (RunningOnValgrind())
92 blink::WebCache::Clear(); 92 blink::WebCache::Clear();
93 delete test_environment; 93 delete test_environment;
94 test_environment = NULL; 94 test_environment = NULL;
95 } 95 }
96 96
97 } // namespace content 97 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/layout_test/layout_test_content_renderer_client.cc ('k') | content/test/fuzzer/fuzzer_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698