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

Unified Diff: content/public/test/render_view_test.cc

Issue 1118383002: Shut down RenderViewTest's scheduler before Blink is. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: const'ify getters Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/test/render_view_test.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 6b7d7f2ebff13df48da3cea5bd47a9c498393af2..1c0dc3d70e4f4e0dc97e4ebbfcb8f04543c1b4f3 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -115,10 +115,16 @@ RenderViewTest::RendererBlinkPlatformImplNoSandbox::
~RendererBlinkPlatformImplNoSandbox() {
}
-blink::Platform* RenderViewTest::RendererBlinkPlatformImplNoSandbox::Get() {
+blink::Platform*
+ RenderViewTest::RendererBlinkPlatformImplNoSandbox::Get() const {
return blink_platform_impl_.get();
}
+scheduler::RendererScheduler*
+ RenderViewTest::RendererBlinkPlatformImplNoSandbox::Scheduler() const {
+ return renderer_scheduler_.get();
+}
+
RenderViewTest::RenderViewTest()
: view_(NULL) {
}
@@ -280,6 +286,7 @@ void RenderViewTest::TearDown() {
autorelease_pool_.reset(NULL);
#endif
+ blink_platform_impl_.Scheduler()->Shutdown();
blink::shutdown();
platform_->PlatformUninitialize();
« no previous file with comments | « content/public/test/render_view_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698