Rename ApplicationDelegate to ShellClient

mojo/public/cpp/bindings/tests/versioning_test_service.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 <stdint.h>
 
 #include <map>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
-#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_runner.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 
 namespace mojo {
 namespace test {
 namespace versioning {
 
 struct EmployeeInfo {
  public:
   EmployeeInfo() {}
 
   EmployeePtr employee;
@@ skipping 61 matching lines @@
     callback.Run(true);
   }
 
  private:
   std::map<uint64_t, EmployeeInfo*> employees_;
 
   StrongBinding<HumanResourceDatabase> strong_binding_;
 };
 
 class HumanResourceSystemServer
-    : public ApplicationDelegate,
+    : public ShellClient,
       public InterfaceFactory<HumanResourceDatabase> {
  public:
   HumanResourceSystemServer() {}
 
-  // ApplicationDelegate implementation.
-  bool AcceptConnection(ApplicationConnection* connection) override {
+  // mojo::ShellClient implementation.
+  bool AcceptConnection(Connection* connection) override {
     connection->AddService<HumanResourceDatabase>(this);
     return true;
   }
 
   // InterfaceFactory<HumanResourceDatabase> implementation.
-  void Create(ApplicationConnection* connection,
+  void Create(Connection* connection,
               InterfaceRequest<HumanResourceDatabase> request) override {
     // It will be deleted automatically when the underlying pipe encounters a
     // connection error.
     new HumanResourceDatabaseImpl(request.Pass());
   }
 };
 
 }  // namespace versioning
 }  // namespace test
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(
       new mojo::test::versioning::HumanResourceSystemServer());
 
   return runner.Run(application_request);
 }