ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/standalone/android/android_handler_loader.h

Index: mojo/shell/standalone/android/android_handler_loader.h
diff --git a/mojo/shell/standalone/android/android_handler_loader.h b/mojo/shell/standalone/android/android_handler_loader.h
index 18255d591e106f59dbad5046271b8bb1c23aa6b5..5aac6b1fb29ffeb1584e81eda3bf09089fc2377d 100644
--- a/mojo/shell/standalone/android/android_handler_loader.h
+++ b/mojo/shell/standalone/android/android_handler_loader.h
@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/shell/application_loader.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/standalone/android/android_handler.h"
 
 namespace mojo {
@@ -23,10 +23,10 @@ class AndroidHandlerLoader : public ApplicationLoader {
  private:
   // ApplicationLoader overrides:
   void Load(const GURL& url,
-            InterfaceRequest<mojom::Application> application_request) override;
+            InterfaceRequest<mojom::ShellClient> request) override;
 
   AndroidHandler android_handler_;
-  scoped_ptr<ApplicationImpl> application_;
+  scoped_ptr<ShellConnection> shell_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidHandlerLoader);
 };