Rename ApplicationDelegate to ShellClient

mojo/shell/package_manager/content_handler_unittest.cc

Index: mojo/shell/package_manager/content_handler_unittest.cc
diff --git a/mojo/shell/package_manager/content_handler_unittest.cc b/mojo/shell/package_manager/content_handler_unittest.cc
index 95870f39c84eed8dd0ab46f1c81f5e81ab531fd5..4d743afe8b8a9ac9345b1a4508fe74f8ce9f26ee 100644
--- a/mojo/shell/package_manager/content_handler_unittest.cc
+++ b/mojo/shell/package_manager/content_handler_unittest.cc
@@ -19,10 +19,9 @@
 #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_connection.h"
-#include "mojo/shell/public/cpp/application_delegate.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/interfaces/content_handler.mojom.h"
 #include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/test_package_manager.h"
@@ -73,9 +72,9 @@ void QuitClosure(bool* value) {
 }
 
 class TestContentHandler : public mojom::ContentHandler,
-                           public ApplicationDelegate {
+                           public ShellClient{
  public:
-  TestContentHandler(ApplicationConnection* connection,
+  TestContentHandler(Connection* connection,
                      InterfaceRequest<mojom::ContentHandler> request)
       : binding_(this, std::move(request)) {}
 
@@ -96,7 +95,7 @@ class TestContentHandler : public mojom::ContentHandler,
 };
 
 class TestApplicationLoader : public ApplicationLoader,
-                              public ApplicationDelegate,
+                              public ShellClient,
                               public InterfaceFactory<mojom::ContentHandler> {
  public:
   TestApplicationLoader() : num_loads_(0) {}
@@ -113,14 +112,14 @@ class TestApplicationLoader : public ApplicationLoader,
     test_app_.reset(new ApplicationImpl(this, std::move(application_request)));
   }
 
-  // ApplicationDelegate implementation.
-  bool AcceptConnection(ApplicationConnection* connection) override {
+  // 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(ApplicationConnection* connection,
+  void Create(Connection* connection,
               InterfaceRequest<mojom::ContentHandler> request) override {
     new TestContentHandler(connection, std::move(request));
   }