Do some plumbing.

shell/child_process_host_unittest.cc

Index: shell/child_process_host_unittest.cc
diff --git a/shell/child_process_host_unittest.cc b/shell/child_process_host_unittest.cc
index 6591760d2e79bb569ba7036fb5e4c9fc7e2d3222..276b798097afbbf6589d817e035ade364d1b36a1 100644
--- a/shell/child_process_host_unittest.cc
+++ b/shell/child_process_host_unittest.cc
@@ -13,6 +13,7 @@
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/message_pipe.h"
+#include "shell/application_manager/native_application_options.h"
 #include "shell/context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -49,7 +50,7 @@ TEST(ChildProcessHostTest, MAYBE_StartJoin) {
       scoped_ptr<base::MessagePump>(new mojo::common::MessagePumpMojo()));
   context.Init();
   TestChildProcessHost child_process_host(&context);
-  child_process_host.Start(false /* require_32_bit */);
+  child_process_host.Start(NativeApplicationOptions());
   message_loop.Run();  // This should run until |DidStart()|.
   child_process_host.ExitNow(123);
   int exit_code = child_process_host.Join();
@@ -73,7 +74,7 @@ TEST(ChildProcessHostTest, MAYBE_ConnectionError) {
       scoped_ptr<base::MessagePump>(new mojo::common::MessagePumpMojo()));
   context.Init();
   TestChildProcessHost child_process_host(&context);
-  child_process_host.Start(false /* require_32_bit */);
+  child_process_host.Start(NativeApplicationOptions());
   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.