Move //service/android to //service/java_handler

services/java_handler/java_handler.cc

 // Copyright 2014 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 "services/android/java_handler.h"
+#include "services/java_handler/java_handler.h"
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
@@ skipping 29 matching lines @@
     return false;
 
   return true;
 }
 
 }  // namespace
 
 namespace services {
 namespace android {
 
-JavaHandler::JavaHandler() : content_handler_factory_(this) {
-}
+JavaHandler::JavaHandler() : content_handler_factory_(this) {}
 
-JavaHandler::~JavaHandler() {
-}
+JavaHandler::~JavaHandler() {}
 
 void JavaHandler::RunApplication(
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
   TRACE_EVENT_BEGIN1("java_handler", "JavaHandler::RunApplication", "url",
                      std::string(response->url));
   JNIEnv* env = base::android::AttachCurrentThread();
   base::FilePath archive_path;
   base::FilePath cache_dir;
   {
     base::MessageLoop loop;
     handler_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&JavaHandler::GetApplication, base::Unretained(this),
                    base::Unretained(&archive_path),
                    base::Unretained(&cache_dir), base::Passed(response.Pass()),
                    base::Bind(base::IgnoreResult(
                                   &base::SingleThreadTaskRunner::PostTask),
                               loop.task_runner(), FROM_HERE,
                               base::MessageLoop::QuitWhenIdleClosure())));
     base::RunLoop().Run();
   }
 
-
   jobject context = base::android::GetApplicationContext();
   ScopedJavaLocalRef<jstring> j_archive_path =
       ConvertUTF8ToJavaString(env, archive_path.value());
   ScopedJavaLocalRef<jstring> j_cache_dir =
       ConvertUTF8ToJavaString(env, cache_dir.value());
   Java_JavaHandler_bootstrap(
       env, context, j_archive_path.obj(), j_cache_dir.obj(),
       application_request.PassMessagePipe().release().value());
 }
 
@@ skipping 60 matching lines @@
   return JNI_VERSION_1_4;
 }
 
 // This is needed because the application needs to access the application
 // context.
 extern "C" JNI_EXPORT void InitApplicationContext(
     const base::android::JavaRef<jobject>& context) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::InitApplicationContext(env, context);
 }
-