Replace ChildController with ShellClientFactory

mojo/shell/runner/host/child_process_base.cc

 // Copyright 2014 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/runner/host/child_process_base.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 14 matching lines @@
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/shell/runner/child/child_controller.mojom.h"
+#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "mojo/shell/runner/common/switches.h"
 #include "mojo/shell/runner/init.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 // Blocker ---------------------------------------------------------------------
 
@@ skipping 123 matching lines @@
   scoped_ptr<ChildControllerImpl> controller_;
 
   // Used to unblock the main thread on shutdown.
   Blocker::Unblocker shutdown_unblocker_;
 
   DISALLOW_COPY_AND_ASSIGN(AppContext);
 };
 
 // ChildControllerImpl ------------------------------------------------------
 
-class ChildControllerImpl : public mojom::ChildController {
+class ChildControllerImpl : public mojom::ShellClientFactory {
  public:
   ~ChildControllerImpl() override {
     DCHECK(thread_checker_.CalledOnValidThread());
-
-    // TODO(vtl): Pass in the result from |MainMain()|.
-    on_app_complete_.Run(MOJO_RESULT_UNIMPLEMENTED);
   }
 
   // To be executed on the controller thread. Creates the |ChildController|,
   // etc.
   static void Init(AppContext* app_context,
                    const RunCallback& run_callback,
                    ScopedMessagePipeHandle host_message_pipe,
                    const Blocker::Unblocker& unblocker) {
     DCHECK(app_context);
     DCHECK(host_message_pipe.is_valid());
@@ skipping 13 matching lines @@
     binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
     // recoverable.
     LOG(ERROR) << "Connection error to the shell.";
     _exit(1);
   }
 
-  // |ChildController| methods:
-  void StartApp(InterfaceRequest<mojom::ShellClient> request,
-                const StartAppCallback& on_app_complete) override {
+  // |mojom::ShellClientFactory| methods:
+  void CreateShellClient(mojom::ShellClientRequest request,
+                         const String& name) override {
     DCHECK(thread_checker_.CalledOnValidThread());
-
-    on_app_complete_ = on_app_complete;
     unblocker_.Unblock(base::Bind(run_callback_, base::Passed(&request)));
   }
 
-  void ExitNow(int32_t exit_code) override {
-    DVLOG(2) << "ChildControllerImpl::ExitNow(" << exit_code << ")";
-    _exit(exit_code);
-  }
-
  private:
   ChildControllerImpl(AppContext* app_context,
                       const RunCallback& run_callback,
                       const Blocker::Unblocker& unblocker)
       : run_callback_(run_callback), unblocker_(unblocker), binding_(this) {}
 
   base::ThreadChecker thread_checker_;
   RunCallback run_callback_;
   Blocker::Unblocker unblocker_;
-  StartAppCallback on_app_complete_;
 
-  Binding<ChildController> binding_;
+  Binding<mojom::ShellClientFactory> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildControllerImpl);
 };
 
 ScopedMessagePipeHandle InitializeHostMessagePipe(
     edk::ScopedPlatformHandle platform_channel,
     scoped_refptr<base::TaskRunner> io_task_runner) {
   edk::SetParentPipeHandle(std::move(platform_channel));
   std::string primordial_pipe_token =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 24 matching lines @@
                             base::Passed(&host_pipe), blocker.GetUnblocker()));
 
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 }
 
 }  // namespace shell
 }  // namespace mojo