Reland: Build Mojo apps in sub-dirs, like application packages.

mojo/runner/android/android_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 "mojo/runner/android/android_handler.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 62 matching lines @@
   base::UnloadNativeLibrary(app_library);
 }
 
 // Returns true if |url| denotes a cached app. If true |app_dir| is set to the
 // path of the directory for the app and |path_to_mojo| the path of the app's
 // .mojo file.
 bool IsCachedApp(JNIEnv* env,
                  const GURL& url,
                  base::FilePath* app_dir,
                  base::FilePath* path_to_mojo) {
-  ScopedJavaLocalRef<jstring> j_local_apps_dir =
-      Java_AndroidHandler_getLocalAppsDir(env, GetApplicationContext());
-  const base::FilePath local_apps_fp(
-      ConvertJavaStringToUTF8(env, j_local_apps_dir.obj()));
-  const std::string local_apps(util::FilePathToFileURL(local_apps_fp).spec());
+  ScopedJavaLocalRef<jstring> j_cached_apps_dir =
+      Java_AndroidHandler_getCachedAppsDir(env, GetApplicationContext());
+  const base::FilePath cached_apps_fp(
+      ConvertJavaStringToUTF8(env, j_cached_apps_dir.obj()));
+  const std::string cached_apps(util::FilePathToFileURL(cached_apps_fp).spec());
   const std::string response_url(GURL(url).spec());
-  if (response_url.size() <= local_apps.size() ||
-      local_apps.compare(0u, local_apps.size(), response_url, 0u,
-                         local_apps.size()) != 0) {
+  if (response_url.size() <= cached_apps.size() ||
+      cached_apps.compare(0u, cached_apps.size(), response_url, 0u,
+                          cached_apps.size()) != 0) {
     return false;
   }
 
   const std::string mojo_suffix(".mojo");
   // app_rel_path is either something like html_viewer/html_viewer.mojo, or
   // html_viewer.mojo, depending upon whether the app has a package.
-  const std::string app_rel_path(response_url.substr(local_apps.size() + 1));
+  const std::string app_rel_path(response_url.substr(cached_apps.size() + 1));
   const size_t slash_index = app_rel_path.find('/');
   if (slash_index != std::string::npos) {
     const std::string tail =
         app_rel_path.substr(slash_index + 1, std::string::npos);
     const std::string head = app_rel_path.substr(0, slash_index);
     if (head.find('/') != std::string::npos ||
         tail.size() <= mojo_suffix.size() ||
         tail.compare(tail.size() - mojo_suffix.size(), tail.size(),
                      mojo_suffix) != 0) {
       return false;
     }
-    *app_dir = local_apps_fp.Append(head);
+    *app_dir = cached_apps_fp.Append(head);
     *path_to_mojo = app_dir->Append(tail);
     return true;
   }
   if (app_rel_path.find('/') != std::string::npos ||
       app_rel_path.size() <= mojo_suffix.size() ||
       app_rel_path.compare(app_rel_path.size() - mojo_suffix.size(),
                            mojo_suffix.size(), mojo_suffix) != 0) {
     return false;
   }
 
-  *app_dir = local_apps_fp.Append(
+  *app_dir = cached_apps_fp.Append(
       app_rel_path.substr(0, app_rel_path.size() - mojo_suffix.size()));
-  *path_to_mojo = local_apps_fp.Append(app_rel_path);
+  *path_to_mojo = cached_apps_fp.Append(app_rel_path);
   return true;
 }
 
 }  // namespace
 
 AndroidHandler::AndroidHandler() : content_handler_factory_(this) {
 }
 
 AndroidHandler::~AndroidHandler() {
 }
@@ skipping 40 matching lines @@
   connection->AddService(&content_handler_factory_);
   return true;
 }
 
 bool RegisterAndroidHandlerJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace runner
 }  // namespace mojo