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

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

Issue 1501343002: Prepare chrome to use the new Mojo EDK by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable turning on in this cl Created 5 years 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
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 0cb39a4b6617bb126d78529b8fd960df8f35f157..ba6e6cd9f8b6a586f6a1703ce6d902810258c8ba 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -276,6 +276,12 @@ void RenderViewTest::SetUp() {
#if !defined(OS_IOS)
InitializeMojo();
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
+ test_io_thread_.reset(new base::TestIOThread(
+ base::TestIOThread::kAutoStart));
+ ipc_support_.reset(new mojo::test::ScopedIPCSupport(
+ test_io_thread_->task_runner()));
+ }
#endif
// This needs to pass the mock render thread to the view.
@@ -317,6 +323,9 @@ void RenderViewTest::TearDown() {
platform_.reset();
params_.reset();
command_line_.reset();
+
+ test_io_thread_.reset();
+ ipc_support_.reset();
}
void RenderViewTest::onLeakDetectionComplete(const Result& result) {

Powered by Google App Engine
This is Rietveld 408576698