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

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

Issue 2268283004: Stop calling blink::shutdown in content/ tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test_blink_web_unit_test_support.h" 5 #include "content/test/test_blink_web_unit_test_support.h"
6 6
7 #include "base/feature_list.h" 7 #include "base/feature_list.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // Test shell always exposes the GC. 146 // Test shell always exposes the GC.
147 std::string flags("--expose-gc"); 147 std::string flags("--expose-gc");
148 v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size())); 148 v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
149 } 149 }
150 150
151 TestBlinkWebUnitTestSupport::~TestBlinkWebUnitTestSupport() { 151 TestBlinkWebUnitTestSupport::~TestBlinkWebUnitTestSupport() {
152 url_loader_factory_.reset(); 152 url_loader_factory_.reset();
153 mock_clipboard_.reset(); 153 mock_clipboard_.reset();
154 if (renderer_scheduler_) 154 if (renderer_scheduler_)
155 renderer_scheduler_->Shutdown(); 155 renderer_scheduler_->Shutdown();
156 blink::shutdown();
157 156
158 // Clear the FeatureList that was registered in the constructor. 157 // Clear the FeatureList that was registered in the constructor.
159 base::FeatureList::ClearInstanceForTesting(); 158 base::FeatureList::ClearInstanceForTesting();
160 } 159 }
161 160
162 blink::WebBlobRegistry* TestBlinkWebUnitTestSupport::blobRegistry() { 161 blink::WebBlobRegistry* TestBlinkWebUnitTestSupport::blobRegistry() {
163 return &blob_registry_; 162 return &blob_registry_;
164 } 163 }
165 164
166 blink::WebClipboard* TestBlinkWebUnitTestSupport::clipboard() { 165 blink::WebClipboard* TestBlinkWebUnitTestSupport::clipboard() {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 return BlinkPlatformImpl::currentThread(); 285 return BlinkPlatformImpl::currentThread();
287 } 286 }
288 287
289 void TestBlinkWebUnitTestSupport::getPluginList( 288 void TestBlinkWebUnitTestSupport::getPluginList(
290 bool refresh, blink::WebPluginListBuilder* builder) { 289 bool refresh, blink::WebPluginListBuilder* builder) {
291 builder->addPlugin("pdf", "pdf", "pdf-files"); 290 builder->addPlugin("pdf", "pdf", "pdf-files");
292 builder->addMediaTypeToLastPlugin("application/pdf", "pdf"); 291 builder->addMediaTypeToLastPlugin("application/pdf", "pdf");
293 } 292 }
294 293
295 } // namespace content 294 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698