Move the android library loader from content to base

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 6a7be8cd5c8e5bcb2bbd11332db7ce8073837a2a..955fe03279102cb6e9e2633f6c2b5264b4f486c7 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1386,46 +1386,46 @@
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
-          'target_name': 'content_linker_test_apk',
+          'target_name': 'chromium_linker_test_apk',
           'type': 'none',
           'dependencies': [
-            'content_android_linker_test',
+            'chromium_android_linker_test',
             'content.gyp:content_java',
             'content_shell_java',
           ],
           'variables': {
-            'apk_name': 'ContentLinkerTest',
+            'apk_name': 'ChromiumLinkerTest',
             'java_in_dir': 'shell/android/linker_test_apk',
             'resource_dir': 'shell/android/linker_test_apk/res',
-            'native_lib_target': 'libcontent_android_linker_test',
+            'native_lib_target': 'libchromium_android_linker_test',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
-            'use_content_linker': '1',
-            'enable_content_linker_tests': '1',
+            'use_chromium_linker': '1',
+            'enable_chromium_linker_tests': '1',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
-          'target_name': 'content_android_linker_test',
+          'target_name': 'chromium_android_linker_test',
           'type': 'shared_library',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'dependencies': [
-            'content_android_linker_test_jni_headers',
+            'chromium_android_linker_test_jni_headers',
             'content_shell_lib',
             # Required to include "content/public/browser/android/compositor.h"
-            # in content_linker_test_android.cc :-(
+            # in chromium_linker_test_android.cc :-(
             '../skia/skia.gyp:skia',
           ],
           'sources': [
-            'shell/android/linker_test_apk/content_linker_test_android.cc',
-            'shell/android/linker_test_apk/content_linker_test_linker_tests.cc',
+            'shell/android/linker_test_apk/chromium_linker_test_android.cc',
+            'shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc',
           ],
         },
         {
-          'target_name': 'content_android_linker_test_jni_headers',
+          'target_name': 'chromium_android_linker_test_jni_headers',
           'type': 'none',
           'sources': [
-            'shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/LinkerTests.java',
+            'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java',
           ],
           'variables': {
             'jni_gen_package': 'content/shell',