Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

mojo/shell/app_child_process.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/app_child_process.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/scoped_native_library.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "mojo/embedder/embedder.h"
-#include "mojo/public/cpp/bindings/remote_ptr.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/app_child_process.mojom.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 // Blocker ---------------------------------------------------------------------
 
@@ skipping 104 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
 
   base::Thread controller_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> controller_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(AppContext);
 };
 
 // AppChildControllerImpl ------------------------------------------------------
 
-class AppChildControllerImpl : public mojo_shell::AppChildController {
+class AppChildControllerImpl : public AppChildController {
  public:
   virtual ~AppChildControllerImpl() {
     DCHECK(thread_checker_.CalledOnValidThread());
   }
 
   // To be executed on the controller thread. Creates the |AppChildController|,
   // etc.
   static void Init(
       AppContext* app_context,
       embedder::ScopedPlatformHandle platform_channel,
       const Blocker::Unblocker& unblocker) {
     DCHECK(app_context);
     DCHECK(platform_channel.is_valid());
 
     DCHECK(!app_context->controller());
+    // XXX need to use a AppChildControllerPtr here initialized with
+    // AppChildControllerImpl.
     app_context->set_controller(
         make_scoped_ptr(new AppChildControllerImpl(app_context, unblocker)));
     app_context->controller()->CreateChannel(platform_channel.Pass());
   }
 
   void Shutdown() {
     DVLOG(2) << "AppChildControllerImpl::Shutdown()";
     DCHECK(thread_checker_.CalledOnValidThread());
 
     // TODO(vtl): Pass in the result from |MainMain()|.
     controller_client_->AppCompleted(MOJO_RESULT_UNIMPLEMENTED);
 
     // TODO(vtl): Drain then destroy the channel (on the I/O thread).
 
     // This will destroy this object.
     app_context_->set_controller(scoped_ptr<AppChildControllerImpl>());
   }
 
-  // |AppChildController| method:
+  // |AppChildController| methods:
+
+  virtual void SetClient(AppChildControllerClient* client) {
+    controller_client_ = client;
+  }
+
   virtual void StartApp(const String& app_path,
                         ScopedMessagePipeHandle service) OVERRIDE {
     DVLOG(2) << "AppChildControllerImpl::StartApp("
              << app_path.To<std::string>() << ", ...)";
     DCHECK(thread_checker_.CalledOnValidThread());
 
+    // TODO(darin): Add TypeConverter for FilePath <-> mojo::String.
     unblocker_.Unblock(base::Bind(&AppChildControllerImpl::StartAppOnMainThread,
                                   base::FilePath::FromUTF8Unsafe(
                                       app_path.To<std::string>()),
                                   base::Passed(&service)));
   }
 
  private:
   AppChildControllerImpl(AppContext* app_context,
                          const Blocker::Unblocker& unblocker)
       : app_context_(app_context),
         unblocker_(unblocker),
+        controller_client_(NULL),
         channel_info_(NULL) {
   }
 
   void CreateChannel(embedder::ScopedPlatformHandle platform_channel) {
     DVLOG(2) << "AppChildControllerImpl::CreateChannel()";
     DCHECK(thread_checker_.CalledOnValidThread());
 
     ScopedMessagePipeHandle host_message_pipe(embedder::CreateChannel(
         platform_channel.Pass(),
         app_context_->io_runner(),
         base::Bind(&AppChildControllerImpl::DidCreateChannel,
                    base::Unretained(this)),
         base::MessageLoopProxy::current()));
     controller_client_.reset(
-        mojo_shell::ScopedAppChildControllerClientHandle(
-            mojo_shell::AppChildControllerClientHandle(
+        ScopedAppChildControllerClientHandle(
+            AppChildControllerClientHandle(
                 host_message_pipe.release().value())), this);
   }
 
   // Callback for |embedder::CreateChannel()|.
   void DidCreateChannel(embedder::ChannelInfo* channel_info) {
     DVLOG(2) << "AppChildControllerImpl::DidCreateChannel()";
     DCHECK(thread_checker_.CalledOnValidThread());
     channel_info_ = channel_info;
   }
 
@@ skipping 29 matching lines @@
       MojoResult result = main_function(service.release().value());
       if (result < MOJO_RESULT_OK)
         LOG(ERROR) << "MojoMain returned an error: " << result;
     } while (false);
   }
 
   base::ThreadChecker thread_checker_;
   AppContext* const app_context_;
   Blocker::Unblocker unblocker_;
 
-  RemotePtr<mojo_shell::AppChildControllerClient> controller_client_;
+  AppChildControllerClient* controller_client_;
   embedder::ChannelInfo* channel_info_;
 
   DISALLOW_COPY_AND_ASSIGN(AppChildControllerImpl);
 };
 
 }  // namespace
 
 // AppChildProcess -------------------------------------------------------------
 
 AppChildProcess::AppChildProcess() {
@@ skipping 17 matching lines @@
   blocker.Block();
 
   app_context.controller_runner()->PostTask(
       FROM_HERE,
       base::Bind(&AppChildControllerImpl::Shutdown,
       base::Unretained(app_context.controller())));
 }
 
 }  // namespace shell
 }  // namespace mojo