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

mojo/shell/public/cpp/application_test_base.h

 // 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.
 
 #ifndef MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
 #define MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
-#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
+#include "mojo/shell/public/interfaces/shell_client.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
-class ApplicationImpl;
+class ShellConnection;
 
 namespace test {
 
 // Run all application tests. This must be called after the environment is
 // initialized, to support construction of a default run loop.
-MojoResult RunAllTests(MojoHandle application_request_handle);
+MojoResult RunAllTests(MojoHandle shell_client_request_handle);
 
-// Used to configure the ApplicationImpl. This is used internally by
+// Used to configure the ShellConnection. This is used internally by
 // ApplicationTestBase, but useful if you do not want to subclass
 // ApplicationTestBase.
 class TestHelper {
  public:
   explicit TestHelper(ShellClient* client);
   ~TestHelper();
 
-  Shell* shell() { return application_impl_.get(); }
+  Shell* shell() { return shell_connection_.get(); }
   std::string shell_url() { return url_; }
 
  private:
   // The application delegate used if GetShellClient is not overridden.
   ShellClient default_shell_client_;
 
   // The application implementation instance, reconstructed for each test.
-  scoped_ptr<ApplicationImpl> application_impl_;
+  scoped_ptr<ShellConnection> shell_connection_;
 
   std::string url_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestHelper);
 };
 
 // A GTEST base class for application testing executed in mojo_shell.
 class ApplicationTestBase : public testing::Test {
  public:
   ApplicationTestBase();
@@ skipping 23 matching lines @@
   scoped_ptr<TestHelper> test_helper_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationTestBase);
 };
 
 }  // namespace test
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_TEST_BASE_H_