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

mojo/shell/package_manager/content_handler_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <utility>
 
 #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 "base/path_service.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/test_package_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace test {
 namespace {
 
@@ skipping 30 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestFetcher);
 };
 
 void QuitClosure(bool* value) {
   *value = true;
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 class TestContentHandler : public mojom::ContentHandler,
-                           public ShellClient{
+                           public ShellClient {
  public:
   TestContentHandler(Connection* connection,
                      InterfaceRequest<mojom::ContentHandler> request)
       : binding_(this, std::move(request)) {}
 
   // ContentHandler:
   void StartApplication(
-      InterfaceRequest<mojom::Application> application_request,
+      InterfaceRequest<mojom::ShellClient> request,
       URLResponsePtr response,
       const Callback<void()>& destruct_callback) override {
-    apps_.push_back(new ApplicationImpl(this, std::move(application_request)));
+    shell_connections_.push_back(new ShellConnection(this, std::move(request)));
     destruct_callback.Run();
   }
 
  private:
   StrongBinding<mojom::ContentHandler> binding_;
-  ScopedVector<ApplicationImpl> apps_;
+  ScopedVector<ShellConnection> shell_connections_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
 class TestApplicationLoader : public ApplicationLoader,
                               public ShellClient,
                               public InterfaceFactory<mojom::ContentHandler> {
  public:
   TestApplicationLoader() : num_loads_(0) {}
   ~TestApplicationLoader() override {}
 
   int num_loads() const { return num_loads_; }
   const GURL& last_requestor_url() const { return last_requestor_url_; }
 
  private:
   // ApplicationLoader implementation.
   void Load(const GURL& url,
-            InterfaceRequest<mojom::Application> application_request) override {
+            InterfaceRequest<mojom::ShellClient> request) override {
     ++num_loads_;
-    test_app_.reset(new ApplicationImpl(this, std::move(application_request)));
+    shell_connection_.reset(new ShellConnection(this, std::move(request)));
   }
 
   // mojo::ShellClient implementation.
   bool AcceptConnection(Connection* connection) override {
     connection->AddService<mojom::ContentHandler>(this);
     last_requestor_url_ = GURL(connection->GetRemoteApplicationURL());
     return true;
   }
   // InterfaceFactory<mojom::ContentHandler> implementation.
   void Create(Connection* connection,
               InterfaceRequest<mojom::ContentHandler> request) override {
     new TestContentHandler(connection, std::move(request));
   }
 
-  scoped_ptr<ApplicationImpl> test_app_;
+  scoped_ptr<ShellConnection> shell_connection_;
   int num_loads_;
   GURL last_requestor_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplicationLoader);
 };
 
 class TestPackageManagerImpl : public PackageManagerImpl {
  public:
   explicit TestPackageManagerImpl(const base::FilePath& package_path)
       : PackageManagerImpl(package_path, nullptr, nullptr),
@@ skipping 181 matching lines @@
   params->SetTargetURL(GURL("test:test"));
   params->set_connect_callback(
       [&content_handler_id](uint32_t, uint32_t t) { content_handler_id = t; });
   application_manager_->ConnectToApplication(std::move(params));
   EXPECT_EQ(0u, content_handler_id);
 }
 
 }  // namespace test
 }  // namespace package_manager
 }  // namespace mojo