ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/application_package_apptest.cc

 // Copyright 2016 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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 18 matching lines @@
 using GetNameCallback =
     test::mojom::ApplicationPackageApptestService::GetNameCallback;
 
 class ProvidedApplicationDelegate
     : public ShellClient,
       public InterfaceFactory<test::mojom::ApplicationPackageApptestService>,
       public test::mojom::ApplicationPackageApptestService,
       public base::SimpleThread {
  public:
   ProvidedApplicationDelegate(const std::string& name,
-                              InterfaceRequest<mojom::Application> request,
+                              InterfaceRequest<mojom::ShellClient> request,
                               const Callback<void()>& destruct_callback)
       : base::SimpleThread(name),
         name_(name),
         request_(std::move(request)),
         destruct_callback_(destruct_callback) {
     Start();
   }
   ~ProvidedApplicationDelegate() override {
     Join();
     destruct_callback_.Run();
@@ skipping 21 matching lines @@
   }
 
   // base::SimpleThread:
   void Run() override {
     ApplicationRunner(this).Run(request_.PassMessagePipe().release().value(),
                                 false);
     delete this;
   }
 
   const std::string name_;
-  InterfaceRequest<mojom::Application> request_;
+  InterfaceRequest<mojom::ShellClient> request_;
   const Callback<void()> destruct_callback_;
   WeakBindingSet<test::mojom::ApplicationPackageApptestService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ProvidedApplicationDelegate);
 };
 
 class ApplicationPackageApptestDelegate
     : public ShellClient,
       public InterfaceFactory<mojom::ContentHandler>,
       public InterfaceFactory<test::mojom::ApplicationPackageApptestService>,
@@ skipping 19 matching lines @@
   }
 
   // InterfaceFactory<test::mojom::ApplicationPackageApptestService>:
   void Create(Connection* connection,
               InterfaceRequest<test::mojom::ApplicationPackageApptestService>
                   request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::ContentHandler:
-  void StartApplication(InterfaceRequest<mojom::Application> request,
+  void StartApplication(InterfaceRequest<mojom::ShellClient> request,
                         URLResponsePtr response,
                         const Callback<void()>& destruct_callback) override {
     const std::string url = response->url;
     if (url == "mojo://package_test_a/") {
       new ProvidedApplicationDelegate("A", std::move(request),
                                       destruct_callback);
     } else if (url == "mojo://package_test_b/") {
       new ProvidedApplicationDelegate("B", std::move(request),
                                       destruct_callback);
     }
@@ skipping 67 matching lines @@
     base::RunLoop run_loop;
     std::string b_name;
     service_b->GetName(base::Bind(&ReceiveName, &b_name, &run_loop));
     run_loop.Run();
     EXPECT_EQ("B", b_name);
   }
 }
 
 }  // namespace shell
 }  // namespace mojo