Rename ApplicationDelegate to ShellClient

components/web_view/test_runner/test_runner_application_delegate.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 "components/web_view/test_runner/test_runner_application_delegate.h"
 
 #include <iostream>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "components/mus/public/cpp/scoped_window_ptr.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "components/test_runner/blink_test_platform_support.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #endif
 
@@ skipping 16 matching lines @@
   request->url = test_url.spec();
   web_view_->web_view()->LoadRequest(std::move(request));
 }
 
 void TestRunnerApplicationDelegate::Terminate() {
   if (root_)
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// mojo::ApplicationDelegate implementation:
+// mojo::ShellClient implementation:
 
 void TestRunnerApplicationDelegate::Initialize(mojo::Shell* shell,
                                                const std::string& url,
                                                uint32_t id) {
   if (!test_runner::BlinkTestPlatformInitialize()) {
     NOTREACHED() << "Test environment could not be properly set up for blink.";
   }
   shell_ = shell;
   mus::CreateWindowTreeHost(shell_, this, &host_, nullptr);
 }
 
 bool TestRunnerApplicationDelegate::AcceptConnection(
-    mojo::ApplicationConnection* connection) {
+    mojo::Connection* connection) {
   connection->AddService<web_view::LayoutTestRunner>(this);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // mus::WindowTreeDelegate implementation:
 
 void TestRunnerApplicationDelegate::OnEmbed(mus::Window* root) {
   root_ = root;
 
@@ skipping 63 matching lines @@
   if (test_info)
     LaunchURL(test_info->url);
   else
     Terminate();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // mojo::InterfaceFactory<LayoutTestRunner> implementation:
 
 void TestRunnerApplicationDelegate::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<web_view::LayoutTestRunner> request) {
   layout_test_runner_.AddBinding(this, std::move(request));
 }
 
 }  // namespace web_view