Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mojo/shell/standalone/android/android_handler.cc

Index: mojo/shell/standalone/android/android_handler.cc
diff --git a/mojo/shell/standalone/android/android_handler.cc b/mojo/shell/standalone/android/android_handler.cc
index f3de55faa5c9e606660e46933ee7c2b439738131..175923baea8c1268bece0785077dd64125318d93 100644
--- a/mojo/shell/standalone/android/android_handler.cc
+++ b/mojo/shell/standalone/android/android_handler.cc
@@ -16,7 +16,7 @@
 #include "jni/AndroidHandler_jni.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/runner/host/native_application_support.h"
 #include "mojo/shell/standalone/android/run_android_application_function.h"
 #include "mojo/util/filename_util.h"
@@ -166,7 +166,9 @@ void AndroidHandler::RunApplication(
       reinterpret_cast<jlong>(run_android_application_fn));
 }
 
-void AndroidHandler::Initialize(ApplicationImpl* app) {}
+void AndroidHandler::Initialize(Shell* shell,
+                                const std::string& url,
+                                uint32_t id) {}
 
 bool AndroidHandler::AcceptConnection(ApplicationConnection* connection) {
   connection->AddService(&content_handler_factory_);