Remove Client relationship between mojo.Shell/mojo.Application

mojo/services/view_manager/public/cpp/tests/view_manager_unittest.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/services/view_manager/public/cpp/view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 45 matching lines @@
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
   }
 
   // Overridden from ApplicationLoader:
   void Load(ApplicationManager* manager,
             const GURL& url,
-            ShellPtr shell,
+            InterfaceRequest<Application> application_request,
             LoadCallback callback) override {
-    ASSERT_TRUE(shell);
-    scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this, shell.Pass()));
+    ASSERT_TRUE(application_request.is_pending());
+    scoped_ptr<ApplicationImpl> app(
+        new ApplicationImpl(this, application_request.Pass()));
     apps_.push_back(app.release());
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
@@ skipping 562 matching lines @@
 
 // TODO(beng): tests for focus:
 // - focus between two views known to a connection
 // - focus between views unknown to one of the connections.
 // - focus between views unknown to either connection.
 
 // TODO(sky): need test of root being destroyed with existing views. See
 // 434555 for specific case.
 
 }  // namespace mojo