Move the android library loader from content to base

base/android/java/templates/NativeLibraries.template

Index: base/android/java/templates/NativeLibraries.template
diff --git a/content/public/android/java/templates/NativeLibraries.template b/base/android/java/templates/NativeLibraries.template
similarity index 67%
rename from content/public/android/java/templates/NativeLibraries.template
rename to base/android/java/templates/NativeLibraries.template
index dd710cd01b77c01ed454657532fbc10c70d48ed9..f14be211f3f1c8b3664dd379b64ad923cdd890e1 100644
--- a/content/public/android/java/templates/NativeLibraries.template
+++ b/base/android/java/templates/NativeLibraries.template
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.app;
+package org.chromium.base.library_loader;
 
 public class NativeLibraries {
     /**
@@ -13,16 +13,16 @@ public class NativeLibraries {
      * - This template is used to generate several distinct, but similar
      *   files used in different contexts:
      *
-     *   o .../gen/templates/org/chromium/content/app/NativeLibraries.java
+     *   o .../gen/templates/org/chromium/base/library_loader/NativeLibraries.java
      *
-     *     This file is used to build content.jar, which is the library
-     *     jar used by several content-based projects. However, the
+     *     This file is used to build base.jar, which is the library
+     *     jar used by chromium projects. However, the
      *     corresponding NativeLibraries.class file will _not_ be part
-     *     of the final content.jar.
+     *     of the final base.jar.
      *
      *   o .../$PROJECT/native_libraries_java/NativeLibraries.java
      *
-     *     This file is used to build a content-based APK (e.g. $PROJECT
+     *     This file is used to build an APK (e.g. $PROJECT
      *     could be 'content_shell_apk'). Its content will depend on
      *     this target's specific build configuration, and differ from
      *     the source file above.
@@ -32,29 +32,30 @@ public class NativeLibraries {
      *   will be put into the final output file, and used at runtime.
      *
      * - If the variables were defined as 'final', their value would be
-     *   optimized out inside of 'content.jar', and could not be specialized
-     *   for every content-based program.
+     *   optimized out inside of 'base.jar', and could not be specialized
+     *   for every chromium program. This, however, doesn't apply to arrays of
+     *   strings, which can be defined as final.
      *
      * This exotic scheme is used to avoid injecting project-specific, or
-     * even build-specific, values into the content layer. E.g. this is
+     * even build-specific, values into the base layer. E.g. this is
      * how the component build is supported on Android without modifying
      * the sources of each and every Chromium-based target.
      */
-    // Set to true to enable the use of the content Linker.
-#if defined(ENABLE_CONTENT_LINKER)
+    // Set to true to enable the use of the Chromium Linker.
+#if defined(ENABLE_CHROMIUM_LINKER)
     public static boolean USE_LINKER = true;
 #else
     public static boolean USE_LINKER = false;
 #endif
 
-#if defined(ENABLE_CONTENT_LINKER_TESTS)
+#if defined(ENABLE_CHROMIUM_LINKER_TESTS)
     public static boolean ENABLE_LINKER_TESTS = true;
 #else
     public static boolean ENABLE_LINKER_TESTS = false;
 #endif
 
     // This is the list of native libraries to be loaded (in the correct order)
-    // by LibraryLoader.java.  The content java library is compiled with no
+    // by LibraryLoader.java.  The base java library is compiled with no
     // array defined, and then the build system creates a version of the file
     // with the real list of libraries required (which changes based upon which
     // .apk is being built).
@@ -64,11 +65,8 @@ public class NativeLibraries {
 #include <native_libraries_array.h>
       ;
     // This is the expected version of the 'main' native library, which is the one that
-    // implements the initial set of content JNI functions including
-    // content::nativeGetVersionName()
-    // Note(aberent): This is logically final, but making it final breaks the build, since it
-    // lets other Java components read its value at compile time rather than at run time, hence
-    // reading it from the wrong class file.
+    // implements the initial set of base JNI functions including
+    // base::android::nativeGetVersionName()
     static String VERSION_NUMBER
 #include <native_libraries_version.h>
       ;