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

Unified Diff: shell/child_process_host_unittest.cc

Issue 1341873002: Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 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
Index: shell/child_process_host_unittest.cc
diff --git a/shell/child_process_host_unittest.cc b/shell/child_process_host_unittest.cc
index d4f22ccca4dffdb2443dacd8cfe40d014cb4774d..6591760d2e79bb569ba7036fb5e4c9fc7e2d3222 100644
--- a/shell/child_process_host_unittest.cc
+++ b/shell/child_process_host_unittest.cc
@@ -49,7 +49,7 @@ TEST(ChildProcessHostTest, MAYBE_StartJoin) {
scoped_ptr<base::MessagePump>(new mojo::common::MessagePumpMojo()));
context.Init();
TestChildProcessHost child_process_host(&context);
- child_process_host.Start();
+ child_process_host.Start(false /* require_32_bit */);
message_loop.Run(); // This should run until |DidStart()|.
child_process_host.ExitNow(123);
int exit_code = child_process_host.Join();
@@ -73,7 +73,7 @@ TEST(ChildProcessHostTest, MAYBE_ConnectionError) {
scoped_ptr<base::MessagePump>(new mojo::common::MessagePumpMojo()));
context.Init();
TestChildProcessHost child_process_host(&context);
- child_process_host.Start();
+ child_process_host.Start(false /* require_32_bit */);
message_loop.Run(); // This should run until |DidStart()|.
// Send |ExitNow()| first, so that the |StartApp()| below won't actually be
// processed, and we'll just get a connection error.

Powered by Google App Engine
This is Rietveld 408576698