Remove Client relationship between mojo.Shell/mojo.Application

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 "shell/app_child_process.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
@@ skipping 166 matching lines @@
 
     app_context->set_controller(impl.Pass());
   }
 
   void OnConnectionError() override {
     // TODO(darin): How should we handle a connection error here?
   }
 
   // |AppChildController| methods:
   void StartApp(const String& app_path,
-                ScopedMessagePipeHandle service) override {
+                InterfaceRequest<Application> application_request) override {
     DVLOG(2) << "AppChildControllerImpl::StartApp(" << app_path << ", ...)";
     DCHECK(thread_checker_.CalledOnValidThread());
 
     unblocker_.Unblock(base::Bind(&AppChildControllerImpl::StartAppOnMainThread,
                                   base::FilePath::FromUTF8Unsafe(app_path),
-                                  base::Passed(&service)));
+                                  base::Passed(&application_request)));
   }
 
  private:
   AppChildControllerImpl(AppContext* app_context,
                          const Blocker::Unblocker& unblocker)
       : app_context_(app_context), unblocker_(unblocker), channel_info_(NULL) {}
 
   // Callback for |embedder::CreateChannel()|.
   void DidCreateChannel(embedder::ChannelInfo* channel_info) {
     DVLOG(2) << "AppChildControllerImpl::DidCreateChannel()";
     DCHECK(thread_checker_.CalledOnValidThread());
     channel_info_ = channel_info;
   }
 
-  static void StartAppOnMainThread(const base::FilePath& app_path,
-                                   ScopedMessagePipeHandle service) {
+  static void StartAppOnMainThread(
+      const base::FilePath& app_path,
+      InterfaceRequest<Application> application_request) {
     // TODO(vtl): This is copied from in_process_dynamic_service_runner.cc.
     DVLOG(2) << "Loading/running Mojo app from " << app_path.value()
              << " out of process";
 
     // We intentionally don't unload the native library as its lifetime is the
     // same as that of the process.
-    DynamicServiceRunner::LoadAndRunService(app_path, service.Pass());
+    DynamicServiceRunner::LoadAndRunService(app_path,
+                                            application_request.Pass());
   }
 
   base::ThreadChecker thread_checker_;
   AppContext* const app_context_;
   Blocker::Unblocker unblocker_;
 
   embedder::ChannelInfo* channel_info_;
 
   DISALLOW_COPY_AND_ASSIGN(AppChildControllerImpl);
 };
@@ skipping 20 matching lines @@
       base::Bind(&AppChildControllerImpl::Init, base::Unretained(&app_context),
                  base::Passed(platform_channel()), blocker.GetUnblocker()));
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 }
 
 }  // namespace shell
 }  // namespace mojo