Rename ApplicationDelegate to ShellClient

mojo/shell/capability_filter_test.h

Index: mojo/shell/capability_filter_test.h
diff --git a/mojo/shell/capability_filter_test.h b/mojo/shell/capability_filter_test.h
index 459cfe87e77536f38f6efef3aedd6bc61b14a6a3..9052d18244efa36131d0dfea557f34efe7c17d42 100644
--- a/mojo/shell/capability_filter_test.h
+++ b/mojo/shell/capability_filter_test.h
@@ -9,7 +9,8 @@
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/capability_filter_unittest.mojom.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
+#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ -21,30 +22,30 @@ class ConnectionValidator;
 // This class models an application who will use the shell to interact with a
 // system service. The shell may limit this application's visibility of the full
 // set of interfaces exposed by that service.
-class TestApplication : public ApplicationDelegate {
+class TestApplication : public ShellClient {
  public:
   TestApplication();
   ~TestApplication() override;
 
  private:
-  // Overridden from ApplicationDelegate:
+  // Overridden from ShellClient:
   void Initialize(Shell* shell, const std::string& url, uint32_t id) override;
-  bool AcceptConnection(ApplicationConnection* connection) override;
+  bool AcceptConnection(Connection* connection) override;
 
   void ConnectionClosed(const std::string& service_url);
 
   Shell* shell_;
   std::string url_;
   ValidatorPtr validator_;
-  scoped_ptr<ApplicationConnection> connection1_;
-  scoped_ptr<ApplicationConnection> connection2_;
+  scoped_ptr<Connection> connection1_;
+  scoped_ptr<Connection> connection2_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplication);
 };
 
 class TestLoader : public ApplicationLoader {
  public:
-  explicit TestLoader(ApplicationDelegate* delegate);
+  explicit TestLoader(ShellClient* delegate);
   ~TestLoader() override;
 
  private:
@@ -52,7 +53,7 @@ class TestLoader : public ApplicationLoader {
   void Load(const GURL& url,
             InterfaceRequest<mojom::Application> request) override;
 
-  scoped_ptr<ApplicationDelegate> delegate_;
+  scoped_ptr<ShellClient> delegate_;
   scoped_ptr<ApplicationImpl> app_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLoader);
@@ -93,8 +94,8 @@ class CapabilityFilterTest : public testing::Test {
   void RunTest();
 
   template<class T>
-  scoped_ptr<ApplicationDelegate> CreateApplicationDelegate() {
-    return scoped_ptr<ApplicationDelegate>(new T);
+  scoped_ptr<ShellClient> CreateShellClient() {
+    return scoped_ptr<ShellClient>(new T);
   }
 
   base::ShadowingAtExitManager at_exit_;