Make android directory for Android-specific bits of SkyShell

sky/shell/ui/engine.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 "sky/shell/ui/engine.h"
 
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
 #include "sky/engine/public/web/Sky.h"
 #include "sky/engine/public/web/WebLocalFrame.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/services/platform/platform_impl.h"
-#include "sky/shell/java_service_provider.h"
+#include "sky/shell/service_provider.h"
 #include "sky/shell/ui/animator.h"
 #include "sky/shell/ui/input_event_converter.h"
 #include "sky/shell/ui/internals.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace sky {
 namespace shell {
 
 namespace {
@@ skipping 17 matching lines @@
 
 Engine::~Engine() {
   if (web_view_)
     web_view_->close();
 }
 
 base::WeakPtr<Engine> Engine::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
-mojo::ServiceProviderPtr Engine::CreateServiceProvider() {
-  mojo::MessagePipe pipe;
-  config_.java_task_runner->PostTask(
-      FROM_HERE,
-      base::Bind(CreateJavaServiceProvider,
-                 base::Passed(mojo::MakeRequest<mojo::ServiceProvider>(
-                     pipe.handle1.Pass()))));
-  return mojo::MakeProxy(
-      mojo::InterfacePtrInfo<mojo::ServiceProvider>(pipe.handle0.Pass(), 0u));
-}
-
 void Engine::Init() {
   TRACE_EVENT0("sky", "Engine::Init");
 
-  service_provider_ = CreateServiceProvider();
+  service_provider_ = CreateServiceProvider(config_.service_provider_context);
   mojo::NetworkServicePtr network_service;
   mojo::ConnectToService(service_provider_.get(), &network_service);
   platform_impl_.reset(new PlatformImpl(network_service.Pass()));
 
   blink::initialize(platform_impl_.get());
 }
 
 void Engine::BeginFrame(base::TimeTicks frame_time) {
   TRACE_EVENT0("sky", "Engine::BeginFrame");
 
@@ skipping 92 matching lines @@
 
 void Engine::initializeLayerTreeView() {
 }
 
 void Engine::scheduleVisualUpdate() {
   animator_->RequestFrame();
 }
 
 void Engine::didCreateIsolate(blink::WebLocalFrame* frame,
                               Dart_Isolate isolate) {
-  Internals::Create(isolate, CreateServiceProvider());
+  Internals::Create(isolate,
+                    CreateServiceProvider(config_.service_provider_context));
 }
 
 blink::ServiceProvider* Engine::services() {
   return this;
 }
 
 mojo::NavigatorHost* Engine::NavigatorHost() {
   return this;
 }
 
 void Engine::RequestNavigate(mojo::Target target,
                              mojo::URLRequestPtr request) {
   // Ignoring target for now.
   base::MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&Engine::LoadURL, GetWeakPtr(), request->url));
 }
 
 void Engine::DidNavigateLocally(const mojo::String& url) {
 }
 
 void Engine::RequestNavigateHistory(int32_t delta) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace shell
 }  // namespace sky