Remove Client relationship between mojo.Shell/mojo.Application

mojo/application/content_handler_factory.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 "mojo/application/content_handler_factory.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 11 matching lines @@
 namespace mojo {
 
 namespace {
 
 class ApplicationThread : public base::PlatformThread::Delegate {
  public:
   ApplicationThread(
       scoped_refptr<base::MessageLoopProxy> handler_thread,
       const base::Callback<void(ApplicationThread*)>& termination_callback,
       ContentHandlerFactory::Delegate* handler_delegate,
-      ShellPtr shell,
+      InterfaceRequest<Application> application_request,
       URLResponsePtr response)
       : handler_thread_(handler_thread),
         termination_callback_(termination_callback),
         handler_delegate_(handler_delegate),
-        shell_(shell.Pass()),
+        application_request_(application_request.Pass()),
         response_(response.Pass()) {}
 
  private:
   void ThreadMain() override {
-    handler_delegate_->RunApplication(shell_.Pass(), response_.Pass());
+    handler_delegate_->RunApplication(application_request_.Pass(),
+                                      response_.Pass());
     handler_thread_->PostTask(FROM_HERE,
                               base::Bind(termination_callback_, this));
   }
 
   scoped_refptr<base::MessageLoopProxy> handler_thread_;
   base::Callback<void(ApplicationThread*)> termination_callback_;
   ContentHandlerFactory::Delegate* handler_delegate_;
-  ShellPtr shell_;
+  InterfaceRequest<Application> application_request_;
   URLResponsePtr response_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationThread);
 };
 
 class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
  public:
   explicit ContentHandlerImpl(ContentHandlerFactory::Delegate* delegate)
       : delegate_(delegate), weak_factory_(this) {}
   ~ContentHandlerImpl() {
     // We're shutting down and doing cleanup. Cleanup may trigger calls back to
     // OnThreadEnd(). As we're doing the cleanup here we don't want to do it in
     // OnThreadEnd() as well. InvalidateWeakPtrs() ensures we don't get any
     // calls to OnThreadEnd().
     weak_factory_.InvalidateWeakPtrs();
     for (auto thread : active_threads_) {
       base::PlatformThread::Join(thread.second);
       delete thread.first;
     }
   }
 
  private:
   // Overridden from ContentHandler:
-  virtual void StartApplication(ShellPtr shell,
-                                URLResponsePtr response) override {
+  virtual void StartApplication(
+      InterfaceRequest<Application> application_request,
+      URLResponsePtr response) override {
     ApplicationThread* thread = new ApplicationThread(
         base::MessageLoopProxy::current(),
         base::Bind(&ContentHandlerImpl::OnThreadEnd,
                    weak_factory_.GetWeakPtr()),
-        delegate_,
-        shell.Pass(),
-        response.Pass());
+        delegate_, application_request.Pass(), response.Pass());
     base::PlatformThreadHandle handle;
     bool launched = base::PlatformThread::Create(0, thread, &handle);
     DCHECK(launched);
     active_threads_[thread] = handle;
   }
 
   void OnThreadEnd(ApplicationThread* thread) {
     DCHECK(active_threads_.find(thread) != active_threads_.end());
     base::PlatformThreadHandle handle = active_threads_[thread];
     active_threads_.erase(thread);
@@ skipping 11 matching lines @@
 }  // namespace
 
 ContentHandlerFactory::ContentHandlerFactory(Delegate* delegate)
     : delegate_(delegate) {
 }
 
 ContentHandlerFactory::~ContentHandlerFactory() {
 }
 
 void ContentHandlerFactory::ManagedDelegate::RunApplication(
-    ShellPtr shell,
+    InterfaceRequest<Application> application_request,
     URLResponsePtr response) {
   base::MessageLoop loop(common::MessagePumpMojo::Create());
-  auto application = this->CreateApplication(shell.Pass(), response.Pass());
+  auto application =
+      this->CreateApplication(application_request.Pass(), response.Pass());
   if (application)
     loop.Run();
 }
 
 void ContentHandlerFactory::Create(ApplicationConnection* connection,
                                    InterfaceRequest<ContentHandler> request) {
   BindToRequest(new ContentHandlerImpl(delegate_), &request);
 }
 
 }  // namespace mojo