Rename ApplicationDelegate to ShellClient

media/mojo/services/mojo_media_application.cc

Index: media/mojo/services/mojo_media_application.cc
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index 4722908cfecabab1b062d4bb7cca7977709222f7..a84ef88fff488a30e361289b33913d316fed8ff9 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -9,14 +9,14 @@
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/service_factory_impl.h"
-#include "mojo/shell/public/cpp/application_connection.h"
+#include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/shell.h"
 
 namespace media {
 
 // static
-scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
-  return scoped_ptr<mojo::ApplicationDelegate>(
+scoped_ptr<mojo::ShellClient> MojoMediaApplication::CreateApp() {
+  return scoped_ptr<mojo::ShellClient>(
       new MojoMediaApplication(MojoMediaClient::Create()));
 }
 
@@ -37,14 +37,13 @@ void MojoMediaApplication::Initialize(mojo::Shell* shell,
   mojo_media_client_->Initialize();
 }
 
-bool MojoMediaApplication::AcceptConnection(
-    mojo::ApplicationConnection* connection) {
+bool MojoMediaApplication::AcceptConnection(mojo::Connection* connection) {
   connection->AddService<interfaces::ServiceFactory>(this);
   return true;
 }
 
 void MojoMediaApplication::Create(
-    mojo::ApplicationConnection* connection,
+    mojo::Connection* connection,
     mojo::InterfaceRequest<interfaces::ServiceFactory> request) {
   // The created object is owned by the pipe.
   new ServiceFactoryImpl(std::move(request), connection->GetServiceProvider(),