Remove Client relationship between mojo.Shell/mojo.Application

examples/png_viewer/png_viewer.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 <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_tokenizer.h"
@@ skipping 192 matching lines @@
  private:
   // Overridden from ApplicationDelegate:
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) override {
     connection->AddService(&content_handler_factory_);
     return true;
   }
 
   // Overridden from ContentHandlerFactory::ManagedDelegate:
   virtual scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
-  CreateApplication(ShellPtr shell, URLResponsePtr response) override {
-    return make_handled_factory_holder(
-        new mojo::ApplicationImpl(new PNGView(response.Pass()), shell.Pass()));
+  CreateApplication(InterfaceRequest<Application> application_request,
+                    URLResponsePtr response) override {
+    return make_handled_factory_holder(new mojo::ApplicationImpl(
+        new PNGView(response.Pass()), application_request.Pass()));
   }
 
   ContentHandlerFactory content_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PNGViewer);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::PNGViewer());
   return runner.Run(shell_handle);
 }