Remove Client relationship between mojo.Shell/mojo.Application

services/js/content_handler_main.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 "base/i18n/icu_util.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/public/c/system/main.h"
@@ skipping 20 matching lines @@
 
   // Overridden from ApplicationDelegate:
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(&content_handler_factory_);
     return true;
   }
 
   // Overridden from ContentHandlerFactory::ManagedDelegate:
   scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
-  CreateApplication(mojo::ShellPtr shell,
-                    mojo::URLResponsePtr response) override {
-    return make_scoped_ptr(new JSApp(shell.Pass(), response.Pass()));
+  CreateApplication(
+      mojo::InterfaceRequest<mojo::Application> application_request,
+      mojo::URLResponsePtr response) override {
+    return make_scoped_ptr(
+        new JSApp(application_request.Pass(), response.Pass()));
   }
 
   mojo::ContentHandlerFactory content_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JsContentHandler);
 };
 
 }  // namespace js
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new js::JsContentHandler);
   return runner.Run(shell_handle);
 }