Rename ApplicationDelegate to ShellClient

mojo/shell/public/cpp/lib/application_test_base.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 <utility>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
@@ skipping 95 matching lines @@
 
   int result = RUN_ALL_TESTS();
 
   // Shut down our message pipes before exiting.
   (void)g_application_request.PassMessagePipe();
   g_shell.reset();
 
   return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
 }
 
-TestHelper::TestHelper(ApplicationDelegate* delegate)
+TestHelper::TestHelper(ShellClient* client)
     : application_impl_(new ApplicationImpl(
-          delegate == nullptr ? &default_application_delegate_ : delegate,
+          client == nullptr ? &default_shell_client_ : client,
           std::move(g_application_request))),
       url_(g_url) {
   // Fake application initialization.
   shell::mojom::Application* application = application_impl_.get();
   application->Initialize(std::move(g_shell), g_url, g_id);
 }
 
 TestHelper::~TestHelper() {
   // TODO: commented out until http://crbug.com/533107 is solved.
   // {
   // ApplicationImpl::TestApi test_api(application_impl_);
   // test_api.UnbindConnections(&g_application_request, &g_shell);
   // }
-  // We may have supplied a member as the delegate. Delete |application_impl_|
+  // We may have supplied a member as the client. Delete |application_impl_|
   // while still valid.
   application_impl_.reset();
 }
 
 ApplicationTestBase::ApplicationTestBase() : test_helper_(nullptr) {}
 
 ApplicationTestBase::~ApplicationTestBase() {
 }
 
-ApplicationDelegate* ApplicationTestBase::GetApplicationDelegate() {
+ShellClient* ApplicationTestBase::GetShellClient() {
   return nullptr;
 }
 
 void ApplicationTestBase::SetUp() {
   // A run loop is recommended for ApplicationImpl initialization and
   // communication.
   if (ShouldCreateDefaultRunLoop())
     Environment::InstantiateDefaultRunLoop();
 
   MOJO_CHECK(g_application_request.is_pending());
   MOJO_CHECK(g_shell);
 
   // New applications are constructed for each test to avoid persisting state.
-  test_helper_.reset(new TestHelper(GetApplicationDelegate()));
+  test_helper_.reset(new TestHelper(GetShellClient()));
 }
 
 void ApplicationTestBase::TearDown() {
   MOJO_CHECK(!g_application_request.is_pending());
   MOJO_CHECK(!g_shell);
 
   test_helper_.reset();
 
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo