Move mojo\shell to services\shell

mojo/shell/background/background_shell.cc

Index: mojo/shell/background/background_shell.cc
diff --git a/mojo/shell/background/background_shell.cc b/mojo/shell/background/background_shell.cc
deleted file mode 100644
index a21bbe43038bbad2327ac2b0184e8a2d27654d6f..0000000000000000000000000000000000000000
--- a/mojo/shell/background/background_shell.cc
+++ /dev/null
@@ -1,209 +0,0 @@
-// 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"
-#include "base/path_service.h"
-#include "base/synchronization/waitable_event.h"
-#include "base/threading/simple_thread.h"
-#include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/services/catalog/store.h"
-#include "mojo/shell/connect_params.h"
-#include "mojo/shell/loader.h"
-#include "mojo/shell/public/cpp/shell_client.h"
-#include "mojo/shell/public/cpp/shell_connection.h"
-#include "mojo/shell/shell.h"
-#include "mojo/shell/standalone/context.h"
-
-namespace mojo {
-namespace shell {
-namespace {
-
-scoped_ptr<base::MessagePump> CreateMessagePumpMojo() {
-  return make_scoped_ptr(new common::MessagePumpMojo);
-}
-
-// Used to obtain the ShellClientRequest for an application. When Loader::Load()
-// is called a callback is run with the ShellClientRequest.
-class BackgroundLoader : public Loader {
- public:
-  using Callback = base::Callback<void(mojom::ShellClientRequest)>;
-
-  explicit BackgroundLoader(const Callback& callback) : callback_(callback) {}
-  ~BackgroundLoader() override {}
-
-  // Loader:
-  void Load(const std::string& name,
-            mojom::ShellClientRequest request) override {
-    DCHECK(!callback_.is_null());  // Callback should only be run once.
-    Callback callback = callback_;
-    callback_.Reset();
-    callback.Run(std::move(request));
-  }
-
- private:
-  Callback callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(BackgroundLoader);
-};
-
-class MojoMessageLoop : public base::MessageLoop {
- public:
-  MojoMessageLoop()
-      : base::MessageLoop(base::MessageLoop::TYPE_CUSTOM,
-                          base::Bind(&CreateMessagePumpMojo)) {}
-  ~MojoMessageLoop() override {}
-
-  void BindToCurrentThread() { base::MessageLoop::BindToCurrentThread(); }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MojoMessageLoop);
-};
-
-}  // namespace
-
-// Manages the thread to startup mojo.
-class BackgroundShell::MojoThread : public base::SimpleThread {
- public:
-  explicit MojoThread(scoped_ptr<BackgroundShell::InitParams> init_params)
-      : SimpleThread("mojo-background-shell"),
-        init_params_(std::move(init_params)) {}
-  ~MojoThread() override {}
-
-  void CreateShellClientRequest(base::WaitableEvent* signal,
-                                scoped_ptr<ConnectParams> params,
-                                mojom::ShellClientRequest* request) {
-    // Only valid to call this on the background thread.
-    DCHECK_EQ(message_loop_, base::MessageLoop::current());
-
-    // Ownership of |loader| passes to Shell.
-    const std::string name = params->target().name();
-    BackgroundLoader* loader = new BackgroundLoader(
-        base::Bind(&MojoThread::OnGotApplicationRequest, base::Unretained(this),
-                   name, signal, request));
-    context_->shell()->SetLoaderForName(make_scoped_ptr(loader), name);
-    context_->shell()->Connect(std::move(params));
-    // The request is asynchronously processed. When processed
-    // OnGotApplicationRequest() is called and we'll signal |signal|.
-  }
-
-  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_);
-
-    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;
-  }
-
- private:
-  void OnGotApplicationRequest(const std::string& name,
-                               base::WaitableEvent* signal,
-                               mojom::ShellClientRequest* request_result,
-                               mojom::ShellClientRequest actual_request) {
-    *request_result = std::move(actual_request);
-    // Trigger destruction of the loader.
-    context_->shell()->SetLoaderForName(nullptr, name);
-    signal->Signal();
-  }
-
-  // We own this. It's created on the main thread, but destroyed on the
-  // background thread.
-  MojoMessageLoop* message_loop_ = nullptr;
-  // Created in Run() on the background thread.
-  Context* context_ = nullptr;
-
-  scoped_ptr<BackgroundShell::InitParams> init_params_;
-
-  DISALLOW_COPY_AND_ASSIGN(MojoThread);
-};
-
-BackgroundShell::InitParams::InitParams() {}
-BackgroundShell::InitParams::~InitParams() {}
-
-BackgroundShell::BackgroundShell() {}
-
-BackgroundShell::~BackgroundShell() {
-  thread_->Stop();
-}
-
-void BackgroundShell::Init(scoped_ptr<InitParams> init_params) {
-  DCHECK(!thread_);
-  thread_.reset(new MojoThread(std::move(init_params)));
-  thread_->Start();
-}
-
-mojom::ShellClientRequest BackgroundShell::CreateShellClientRequest(
-    const std::string& name) {
-  scoped_ptr<ConnectParams> params(new ConnectParams);
-  params->set_source(CreateShellIdentity());
-  params->set_target(Identity(name, mojom::kRootUserID));
-  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