Adds option to run browser tests in mash

mojo/shell/background/background_shell.cc

 // Copyright 2016 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 "mojo/shell/background/background_shell.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 84 matching lines @@
   base::MessageLoop* message_loop() { return message_loop_; }
 
   // Stops the background thread.
   void Stop() {
     DCHECK_NE(message_loop_, base::MessageLoop::current());
     message_loop_->task_runner()->PostTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     Join();
   }
 
+  void RunShellCallback(const BackgroundShell::ShellThreadCallback& callback) {
+    DCHECK_EQ(message_loop_, base::MessageLoop::current());
+    callback.Run(context_->shell());
+  }
+
   // base::SimpleThread:
   void Start() override {
     DCHECK(!message_loop_);
     message_loop_ = new MojoMessageLoop;
     base::SimpleThread::Start();
   }
   void Run() override {
     // The construction/destruction order is very finicky and has to be done
     // in the order here.
     scoped_ptr<base::MessageLoop> message_loop(message_loop_);
 
-    Context::EnsureEmbedderIsInitialized();
-
-    message_loop_->BindToCurrentThread();
-
-    scoped_ptr<Context> context(new Context);
-    context_ = context.get();
     scoped_ptr<mojo::shell::Context::InitParams> context_init_params(
         new mojo::shell::Context::InitParams);
     if (init_params_) {
       context_init_params->catalog_store =
           std::move(init_params_->catalog_store);
       context_init_params->native_runner_delegate =
           init_params_->native_runner_delegate;
+      context_init_params->init_edk = init_params_->init_edk;
     }
+    if (context_init_params->init_edk)
+      Context::EnsureEmbedderIsInitialized();
+
+    message_loop_->BindToCurrentThread();
+
+    scoped_ptr<Context> context(new Context);
+    context_ = context.get();
     context_->Init(std::move(context_init_params));
 
     message_loop_->Run();
 
     // Has to happen after run, but while messageloop still valid.
     context_->Shutdown();
 
     // Context has to be destroyed after the MessageLoop has been destroyed.
     message_loop.reset();
     context_ = nullptr;
@@ skipping 44 matching lines @@
   mojom::ShellClientRequest request;
   base::WaitableEvent signal(true, false);
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE, base::Bind(&MojoThread::CreateShellClientRequest,
                             base::Unretained(thread_.get()), &signal,
                             base::Passed(&params), &request));
   signal.Wait();
   return request;
 }
 
+void BackgroundShell::ExecuteOnShellThread(
+    const ShellThreadCallback& callback) {
+  thread_->message_loop()->task_runner()->PostTask(
+      FROM_HERE, base::Bind(&MojoThread::RunShellCallback,
+                            base::Unretained(thread_.get()), callback));
+}
+
 }  // namespace shell
 }  // namespace mojo