Shutdown renderer main message loop before blink::shutdown()

content/public/test/render_view_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/render_view_test.h"
 
 #include <stddef.h>
 
 #include <cctype>
 
@@ skipping 215 matching lines @@
   GoToOffset(-1, url, state);
 }
 
 void RenderViewTest::GoForward(const GURL& url, const PageState& state) {
   GoToOffset(1, url, state);
 }
 
 void RenderViewTest::SetUp() {
   // Blink needs to be initialized before calling CreateContentRendererClient()
   // because it uses blink internally.
-  blink::initialize(blink_platform_impl_.Get());
+  blink::Platform::initialize(blink_platform_impl_.Get());
+  blink::initialize();
 
   content_client_.reset(CreateContentClient());
   content_browser_client_.reset(CreateContentBrowserClient());
   content_renderer_client_.reset(CreateContentRendererClient());
   SetContentClient(content_client_.get());
   SetBrowserClientForTesting(content_browser_client_.get());
   SetRendererClientForTesting(content_renderer_client_.get());
 
 #if defined(OS_WIN)
   // This needs to happen sometime before PlatformInitialize.
@@ skipping 96 matching lines @@
   // Needs to run before blink::shutdown().
   autorelease_pool_.reset(NULL);
 #endif
 
   leak_detector->collectGarbageAndReport();
 
   base::RunLoop().RunUntilIdle();
 
   blink_platform_impl_.Shutdown();
   blink::shutdown();
+  blink::Platform::shutdown();
 
   platform_->PlatformUninitialize();
   platform_.reset();
   params_.reset();
   command_line_.reset();
 
   test_io_thread_.reset();
   ipc_support_.reset();
 }
 
@@ skipping 305 matching lines @@
       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
   frame->Navigate(common_params, StartNavigationParams(), request_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(frame).Wait();
   view_->GetWebView()->updateAllLifecyclePhases();
 }
 
 }  // namespace content