Remove Client relationship between mojo.Shell/mojo.Application

mojo/python/content_handler/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 <python2.7/Python.h>
 #include <dlfcn.h>
 
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/icu_util.h"
@@ skipping 81 matching lines @@
     if (result == nullptr) {
       LOG(ERROR) << "Error while configuring path";
       PyErr_Print();
       return NULL;
     }
 
     return d;
   }
 
   // Overridden from ContentHandlerFactory::ManagedDelegate:
-  void RunApplication(ShellPtr shell, URLResponsePtr response) override {
+  void RunApplication(InterfaceRequest<Application> application_request,
+                      URLResponsePtr response) override {
     std::unique_ptr<base::ScopedTempDir> temp_dir =
         ExtractApplication(response.Pass());
     base::FilePath directory_path = temp_dir->path();
 
     PyObject* d = SetupPythonEnvironment(directory_path.value());
     DCHECK(d);
 
     base::FilePath entry_path = directory_path.Append("__mojo__.py");
 
     FILE* entry_file = base::OpenFile(entry_path, "r");
@@ skipping 15 matching lines @@
       ScopedPyRef py_function(PyMapping_GetItemString(d, kMojoMain));
 
       if (py_function == NULL) {
         LOG(ERROR) << "Locals size: " << PyMapping_Size(d);
         LOG(ERROR) << "MojoMain not found";
         PyErr_Print();
         return;
       }
 
       if (PyCallable_Check(py_function)) {
-        MojoHandle shell_handle = shell.PassMessagePipe().release().value();
-        ScopedPyRef py_input(PyInt_FromLong(shell_handle));
+        MojoHandle application_request_handle =
+            application_request.PassMessagePipe().release().value();
+        ScopedPyRef py_input(PyInt_FromLong(application_request_handle));
         ScopedPyRef py_arguments(PyTuple_New(1));
         // py_input reference is stolen by py_arguments
         PyTuple_SetItem(py_arguments, 0, py_input.Release());
-        // Run MojoMain with shell_handle as the first and only argument.
+        // Run MojoMain with application_request_handle as the first and only
+        // argument.
         ScopedPyRef py_output(PyObject_CallObject(py_function, py_arguments));
 
         if (!py_output) {
           LOG(ERROR) << "Error while executing MojoMain";
           PyErr_Print();
           return;
         }
       } else {
         LOG(ERROR) << "MojoMain is not callable; it should be a function";
       }
@@ skipping 14 matching lines @@
 };
 
 }  // namespace python
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new mojo::python::PythonContentHandler());
   return runner.Run(shell_handle);
 }