Make android directory for Android-specific bits of SkyShell

sky/shell/shell.cc

Index: sky/shell/shell.cc
diff --git a/sky/shell/shell.cc b/sky/shell/shell.cc
index cc071522ae026f613a1fad3288eba3fd268b5398..5e6851b4d8744ff45bbdf48ef4d08b8951d5cdb5 100644
--- a/sky/shell/shell.cc
+++ b/sky/shell/shell.cc
@@ -9,9 +9,9 @@
 #include "mojo/common/message_pump_mojo.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
+#include "sky/shell/android/platform_service_provider.h"
+#include "sky/shell/android/platform_view.h"
 #include "sky/shell/gpu/rasterizer.h"
-#include "sky/shell/java_service_provider.h"
-#include "sky/shell/platform_view.h"
 #include "sky/shell/ui/engine.h"
 
 namespace sky {
@@ -26,8 +26,8 @@ scoped_ptr<base::MessagePump> CreateMessagePumpMojo() {
 
 }  // namespace
 
-Shell::Shell(scoped_refptr<base::SingleThreadTaskRunner> java_task_runner)
-    : java_task_runner_(java_task_runner) {
+Shell::Shell(scoped_ptr<ServiceProviderContext> service_provider_context)
+    : service_provider_context_(service_provider_context.Pass()) {
   DCHECK(!g_shell);
   mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
       new mojo::embedder::SimplePlatformSupport()));
@@ -43,8 +43,8 @@ Shell::Shell(scoped_refptr<base::SingleThreadTaskRunner> java_task_runner)
 Shell::~Shell() {
 }
 
-void Shell::Init(scoped_refptr<base::SingleThreadTaskRunner> java_task_runner) {
-  g_shell = new Shell(java_task_runner);
+void Shell::Init(scoped_ptr<ServiceProviderContext> service_provider_context) {
+  g_shell = new Shell(service_provider_context.Pass());
 }
 
 Shell& Shell::Shared() {
@@ -64,7 +64,7 @@ void Shell::InitUI(const base::Thread::Options& options) {
   ui_thread_->StartWithOptions(options);
 
   Engine::Config config;
-  config.java_task_runner = java_task_runner_;
+  config.service_provider_context = service_provider_context_.get();
   config.gpu_task_runner = gpu_thread_->message_loop()->task_runner();
   config.gpu_delegate = rasterizer_->GetWeakPtr();
   engine_.reset(new Engine(config));