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/third_party/dynamic_annotations/dynamic_annotations.h" | 13 #include "base/third_party/dynamic_annotations/dynamic_annotations.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/public/common/user_agent.h" |
16 #include "content/public/test/test_content_client_initializer.h" | 16 #include "content/public/test/test_content_client_initializer.h" |
| 17 #include "content/renderer/scheduler/renderer_scheduler.h" |
17 #include "content/test/test_blink_web_unit_test_support.h" | 18 #include "content/test/test_blink_web_unit_test_support.h" |
18 #include "third_party/WebKit/public/web/WebCache.h" | 19 #include "third_party/WebKit/public/web/WebCache.h" |
19 #include "third_party/WebKit/public/web/WebKit.h" | 20 #include "third_party/WebKit/public/web/WebKit.h" |
20 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 21 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
21 #include "url/url_util.h" | 22 #include "url/url_util.h" |
22 | 23 |
23 #if defined(OS_WIN) | 24 #if defined(OS_WIN) |
24 #include "ui/gfx/win/dpi.h" | 25 #include "ui/gfx/win/dpi.h" |
25 #endif | 26 #endif |
26 | 27 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 // Android UI message loop goes through Java, so don't use it in tests. | 59 // Android UI message loop goes through Java, so don't use it in tests. |
59 typedef base::MessageLoop MessageLoopType; | 60 typedef base::MessageLoop MessageLoopType; |
60 #else | 61 #else |
61 typedef base::MessageLoopForUI MessageLoopType; | 62 typedef base::MessageLoopForUI MessageLoopType; |
62 #endif | 63 #endif |
63 | 64 |
64 TestEnvironment() { | 65 TestEnvironment() { |
65 main_message_loop_.reset(new MessageLoopType); | 66 main_message_loop_.reset(new MessageLoopType); |
66 | 67 |
67 // TestBlinkWebUnitTestSupport must be instantiated after MessageLoopType. | 68 // TestBlinkWebUnitTestSupport must be instantiated after MessageLoopType. |
68 blink_test_support_.reset(new TestBlinkWebUnitTestSupport); | 69 blink_test_support_.reset( |
| 70 new TestBlinkWebUnitTestSupport( |
| 71 content::RendererScheduler::Create().release())); |
69 content_initializer_.reset(new content::TestContentClientInitializer()); | 72 content_initializer_.reset(new content::TestContentClientInitializer()); |
70 } | 73 } |
71 | 74 |
72 ~TestEnvironment() { | 75 ~TestEnvironment() { |
73 } | 76 } |
74 | 77 |
75 TestBlinkWebUnitTestSupport* blink_platform_impl() const { | 78 TestBlinkWebUnitTestSupport* blink_platform_impl() const { |
76 return blink_test_support_.get(); | 79 return blink_test_support_.get(); |
77 } | 80 } |
78 | 81 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 // http://code.google.com/p/chromium/issues/detail?id=9500 | 120 // http://code.google.com/p/chromium/issues/detail?id=9500 |
118 base::RunLoop().RunUntilIdle(); | 121 base::RunLoop().RunUntilIdle(); |
119 | 122 |
120 if (RunningOnValgrind()) | 123 if (RunningOnValgrind()) |
121 blink::WebCache::clear(); | 124 blink::WebCache::clear(); |
122 delete test_environment; | 125 delete test_environment; |
123 test_environment = NULL; | 126 test_environment = NULL; |
124 } | 127 } |
125 | 128 |
126 } // namespace content | 129 } // namespace content |
OLD | NEW |