Remove Client relationship between mojo.Shell/mojo.Application

shell/application_manager/application_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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 97 matching lines @@
   }
 
   void set_context(TestContext* context) { context_ = context; }
   int num_loads() const { return num_loads_; }
   const std::vector<std::string>& GetArgs() const { return test_app_->args(); }
 
  private:
   // ApplicationLoader implementation.
   void Load(ApplicationManager* manager,
             const GURL& url,
-            ShellPtr shell,
+            InterfaceRequest<Application> application_request,
             LoadCallback callback) override {
     ++num_loads_;
-    test_app_.reset(new ApplicationImpl(this, shell.Pass()));
+    test_app_.reset(new ApplicationImpl(this, application_request.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
   }
@@ skipping 191 matching lines @@
                public InterfaceFactory<TestB>,
                public InterfaceFactory<TestC> {
  public:
   Tester(TesterContext* context, const std::string& requestor_url)
       : context_(context), requestor_url_(requestor_url) {}
   ~Tester() override {}
 
  private:
   void Load(ApplicationManager* manager,
             const GURL& url,
-            ShellPtr shell,
+            InterfaceRequest<Application> application_request,
             LoadCallback callback) override {
-    app_.reset(new ApplicationImpl(this, shell.Pass()));
+    app_.reset(new ApplicationImpl(this, application_request.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     if (!requestor_url_.empty() &&
         requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
       context_->QuitSoon();
@@ skipping 373 matching lines @@
                                         GURL("mojo:foo"));
   test_delegate_.AddMapping(GURL("mojo:foo2"), GURL("mojo:foo"));
 
   TestServicePtr test_service;
   application_manager_->ConnectToService(GURL("mojo:foo2"), &test_service);
   EXPECT_EQ(1, custom_loader->num_loads());
   custom_loader->set_context(nullptr);
 }
 
 TEST_F(ApplicationManagerTest, ExternalApp) {
-  MessagePipe shell_pipe;
-  ShellPtr shell;
-  shell.Bind(shell_pipe.handle0.Pass());
+  ApplicationPtr application;
   TestExternal external;
   std::vector<std::string> args;
   args.push_back("test");
-  ApplicationImpl app(&external, shell.Pass());
+  ApplicationImpl app(&external, GetProxy(&application));
   application_manager_->RegisterExternalApplication(GURL("mojo:test"), args,
-                                                    shell_pipe.handle1.Pass());
+                                                    application.Pass());
   loop_.Run();
   EXPECT_EQ(args, external.initialize_args());
   application_manager_->ConnectToServiceByName(
       GURL("mojo:test"), std::string());
   loop_.Run();
   EXPECT_TRUE(external.configure_incoming_connection_called());
 };
 
 }  // namespace mojo