Remove Client relationship between mojo.Shell/mojo.Application

shell/dynamic_service_runner.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/dynamic_service_runner.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h"
@@ skipping 22 matching lines @@
                << " to return thunks of size: " << expected_size;
     return false;
   }
   return true;
 }
 
 }  // namespace
 
 base::NativeLibrary DynamicServiceRunner::LoadAndRunService(
     const base::FilePath& app_path,
-    ScopedMessagePipeHandle service_handle) {
+    InterfaceRequest<Application> application_request) {
   DVLOG(2) << "Loading/running Mojo app in process from library: "
            << app_path.value();
   base::NativeLibraryLoadError error;
   base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
   do {
     if (!app_library) {
       LOG(ERROR) << "Failed to load app library (error: " << error.ToString()
                  << ")";
       break;
     }
@@ skipping 37 matching lines @@
     // not everything is a visual app.
 
     typedef MojoResult (*MojoMainFunction)(MojoHandle);
     MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
         base::GetFunctionPointerFromNativeLibrary(app_library, "MojoMain"));
     if (!main_function) {
       LOG(ERROR) << app_path.value() << " MojoMain not found";
       break;
     }
     // |MojoMain()| takes ownership of the service handle.
-    MojoResult result = main_function(service_handle.release().value());
+    MojoHandle handle = application_request.PassMessagePipe().release().value();
+    MojoResult result = main_function(handle);
     if (result < MOJO_RESULT_OK) {
       LOG(ERROR) << app_path.value() << " MojoMain returned error(" << result
                  << ")";
     }
   } while (false);
 
   return app_library;
 }
 
 }  // namespace shell
 }  // namespace mojo