Moves android specific code into android directory

shell/context.cc

 // Copyright 2013 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 "shell/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/spy/spy.h"
 #include "services/tracing/tracing.mojom.h"
 #include "shell/dynamic_application_loader.h"
 #include "shell/external_application_listener.h"
 #include "shell/in_process_dynamic_service_runner.h"
 #include "shell/out_of_process_dynamic_service_runner.h"
 #include "shell/switches.h"
-#include "shell/ui_application_loader_android.h"
 #include "url/gurl.h"
 
-#if defined(OS_ANDROID)
-#include "services/gles2/gpu_impl.h"
-#include "services/native_viewport/native_viewport_impl.h"
-#include "shell/android/android_handler_loader.h"
-#endif  // defined(OS_ANDROID)
-
 namespace mojo {
 namespace shell {
 namespace {
 
 // These mojo: URLs are loaded directly from the local filesystem. They
 // correspond to shared libraries bundled alongside the mojo_shell.
 const char* kLocalMojoURLs[] = {
     "mojo:network_service",
 };
 
@@ skipping 62 matching lines @@
     const GURL to(pair.second);
     if (!from.is_valid() || !to.is_valid())
       return false;
     resolver->AddCustomMapping(from, to);
   }
   return true;
 }
 
 }  // namespace
 
-#if defined(OS_ANDROID)
-class Context::NativeViewportApplicationLoader
-    : public ApplicationLoader,
-      public ApplicationDelegate,
-      public InterfaceFactory<NativeViewport>,
-      public InterfaceFactory<Gpu> {
- public:
-  NativeViewportApplicationLoader() : gpu_state_(new gles2::GpuImpl::State) {}
-  virtual ~NativeViewportApplicationLoader() {}
-
- private:
-  // ApplicationLoader implementation.
-  virtual void Load(ApplicationManager* manager,
-                    const GURL& url,
-                    ScopedMessagePipeHandle shell_handle,
-                    LoadCallback callback) override {
-    DCHECK(shell_handle.is_valid());
-    app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
-  }
-
-  virtual void OnApplicationError(ApplicationManager* manager,
-                                  const GURL& url) override {}
-
-  // ApplicationDelegate implementation.
-  virtual bool ConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) override {
-    connection->AddService<NativeViewport>(this);
-    connection->AddService<Gpu>(this);
-    return true;
-  }
-
-  // InterfaceFactory<NativeViewport> implementation.
-  virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<NativeViewport> request) override {
-    BindToRequest(new native_viewport::NativeViewportImpl(app_.get(), false),
-                  &request);
-  }
-
-  // InterfaceFactory<Gpu> implementation.
-  virtual void Create(ApplicationConnection* connection,
-                      InterfaceRequest<Gpu> request) override {
-    new gles2::GpuImpl(request.Pass(), gpu_state_);
-  }
-
-  scoped_refptr<gles2::GpuImpl::State> gpu_state_;
-  scoped_ptr<ApplicationImpl> app_;
-  DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
-};
-#endif
-
 Context::Context() : application_manager_(this) {
   DCHECK(!base::MessageLoop::current());
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 void Context::EnsureEmbedderIsInitialized() {
   setup.Get();
@@ skipping 39 matching lines @@
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
   DynamicApplicationLoader* dynamic_application_loader =
       new DynamicApplicationLoader(this, runner_factory.Pass());
   InitContentHandlers(dynamic_application_loader, command_line);
   application_manager_.set_default_loader(
       scoped_ptr<ApplicationLoader>(dynamic_application_loader));
 
-// The native viewport service synchronously waits for certain messages. If we
-// don't run it on its own thread we can easily deadlock. Long term native
-// viewport should run its own process so that this isn't an issue.
-#if defined(OS_ANDROID)
-  application_manager_.SetLoaderForURL(
-      scoped_ptr<ApplicationLoader>(new UIApplicationLoader(
-          scoped_ptr<ApplicationLoader>(new NativeViewportApplicationLoader()),
-          this)),
-      GURL("mojo:native_viewport_service"));
-#endif
-
   if (command_line->HasSwitch(switches::kSpy)) {
     spy_.reset(
         new mojo::Spy(&application_manager_,
                       command_line->GetSwitchValueASCII(switches::kSpy)));
     // TODO(cpu): the spy can snoop, but can't tell anybody until
     // the Spy::WebSocketDelegate is implemented. In the original repo this
     // was implemented by src\mojo\spy\websocket_server.h and .cc.
   }
 
-#if defined(OS_ANDROID)
-  {
-    // Android handler is bundled with the Mojo shell, because it uses the
-    // MojoShell application as the JNI bridge to bootstrap execution of other
-    // Android Mojo apps that need JNI.
-    scoped_ptr<BackgroundShellApplicationLoader> loader(
-        new BackgroundShellApplicationLoader(
-            scoped_ptr<ApplicationLoader>(new AndroidHandlerLoader()),
-            "android_handler", base::MessageLoop::TYPE_DEFAULT));
-    application_manager_.SetLoaderForURL(loader.Pass(),
-                                         GURL("mojo:android_handler"));
-  }
-#endif
-
   tracing::TraceDataCollectorPtr trace_data_collector_ptr;
   application_manager_.ConnectToService(GURL("mojo:tracing"),
                                         &trace_data_collector_ptr);
   TracingImpl::Create(trace_data_collector_ptr.Pass());
 
   if (listener_)
     listener_->WaitForListening();
 
   return true;
 }
@@ skipping 22 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo