Rename ApplicationDelegate to ShellClient

components/html_viewer/ax_provider_apptest.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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 64 matching lines @@
 
 using AXProviderTest = mus::WindowServerTestBase;
 
 TEST_F(AXProviderTest, HelloWorld) {
   // Start a test server for net/data/test.html access.
   net::EmbeddedTestServer server;
   server.ServeFilesFromSourceDirectory("net/data");
   ASSERT_TRUE(server.Start());
 
   // Connect to the URL through the mojo:html_viewer content handler.
-  scoped_ptr<ApplicationConnection> connection =
+  scoped_ptr<Connection> connection =
       shell()->ConnectToApplication(server.GetURL("/test.html").spec());
 
   // Embed the html_viewer in a Window.
   mus::mojom::WindowTreeClientPtr tree_client;
   connection->ConnectToService(&tree_client);
   mus::Window* embed_window = window_manager()->NewWindow();
   embed_window->Embed(std::move(tree_client));
 
   TestFrame frame;
   web_view::mojom::FramePtr frame_ptr;
@@ skipping 21 matching lines @@
     EXPECT_TRUE(QuitRunLoop());
   });
   ASSERT_TRUE(DoRunLoopWithTimeout());
 
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "Hello "));
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "World!"));
   EXPECT_FALSE(AxTreeContainsText(ax_tree, "foo"));
 }
 
 }  // namespace mojo