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

Side by Side Diff: content/public/test/render_view_test.cc

Issue 2620633004: Remove mojo::edk::test::ScopedIPCSupport (Closed)
Patch Set: . Created 3 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/test/render_view_test.h" 5 #include "content/public/test/render_view_test.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cctype> 9 #include <cctype>
10 10
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 231
232 void RenderViewTest::GoForward(const GURL& url, const PageState& state) { 232 void RenderViewTest::GoForward(const GURL& url, const PageState& state) {
233 GoToOffset(1, url, state); 233 GoToOffset(1, url, state);
234 } 234 }
235 235
236 void RenderViewTest::SetUp() { 236 void RenderViewTest::SetUp() {
237 // Initialize mojo firstly to enable Blink initialization to use it. 237 // Initialize mojo firstly to enable Blink initialization to use it.
238 InitializeMojo(); 238 InitializeMojo();
239 test_io_thread_.reset(new base::TestIOThread(base::TestIOThread::kAutoStart)); 239 test_io_thread_.reset(new base::TestIOThread(base::TestIOThread::kAutoStart));
240 ipc_support_.reset( 240 ipc_support_.reset(new mojo::edk::ScopedIPCSupport(
241 new mojo::edk::test::ScopedIPCSupport(test_io_thread_->task_runner())); 241 test_io_thread_->task_runner(),
242 mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST));
242 243
243 // Blink needs to be initialized before calling CreateContentRendererClient() 244 // Blink needs to be initialized before calling CreateContentRendererClient()
244 // because it uses blink internally. 245 // because it uses blink internally.
245 blink::initialize(blink_platform_impl_.Get()); 246 blink::initialize(blink_platform_impl_.Get());
246 247
247 content_client_.reset(CreateContentClient()); 248 content_client_.reset(CreateContentClient());
248 content_browser_client_.reset(CreateContentBrowserClient()); 249 content_browser_client_.reset(CreateContentBrowserClient());
249 content_renderer_client_.reset(CreateContentRendererClient()); 250 content_renderer_client_.reset(CreateContentRendererClient());
250 SetContentClient(content_client_.get()); 251 SetContentClient(content_client_.get());
251 SetBrowserClientForTesting(content_browser_client_.get()); 252 SetBrowserClientForTesting(content_browser_client_.get());
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); 673 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
673 frame->Navigate(common_params, StartNavigationParams(), request_params); 674 frame->Navigate(common_params, StartNavigationParams(), request_params);
674 675
675 // The load actually happens asynchronously, so we pump messages to process 676 // The load actually happens asynchronously, so we pump messages to process
676 // the pending continuation. 677 // the pending continuation.
677 FrameLoadWaiter(frame).Wait(); 678 FrameLoadWaiter(frame).Wait();
678 view_->GetWebView()->updateAllLifecyclePhases(); 679 view_->GetWebView()->updateAllLifecyclePhases();
679 } 680 }
680 681
681 } // namespace content 682 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/render_view_test.h ('k') | content/renderer/render_thread_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698