Move the android library loader from content to base

content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java

Index: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
diff --git a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
similarity index 92%
rename from content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
rename to content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
index 7a2a46e600dd12ee600b8c9d69f20ded021033de..b788a2e4e160fae72be3006a6795c2d383e2402d 100644
--- a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
+++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
@@ -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_linker_test_apk;
+package org.chromium.chromium_linker_test_apk;
 
 import android.app.Activity;
 import android.content.Context;
@@ -14,12 +14,12 @@ import android.view.View;
 
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
-import org.chromium.content.app.LibraryLoader;
-import org.chromium.content.app.Linker;
+import org.chromium.base.library_loader.LibraryLoader;
+import org.chromium.base.library_loader.Linker;
+import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
-import org.chromium.content.common.ProcessInitException;
 import org.chromium.content_shell.Shell;
 import org.chromium.content_shell.ShellManager;
 import org.chromium.ui.base.ActivityWindowAndroid;
@@ -28,11 +28,11 @@ import org.chromium.ui.base.WindowAndroid;
 /**
  * Test activity used for verifying the different configuration options for the ContentLinker.
  */
-public class ContentLinkerTestActivity extends Activity {
+public class ChromiumLinkerTestActivity extends Activity {
     public static final String COMMAND_LINE_FILE =
-            "/data/local/tmp/content-linker-test-command-line";
+            "/data/local/tmp/chromium-linker-test-command-line";
 
-    private static final String TAG = "ContentLinkerTestActivity";
+    private static final String TAG = "ChromiumLinkerTestActivity";
 
     public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
 
@@ -87,7 +87,7 @@ public class ContentLinkerTestActivity extends Activity {
         try {
             LibraryLoader.ensureInitialized();
         } catch (ProcessInitException e) {
-            Log.i(TAG, "Cannot load content_linker_test:" +  e);
+            Log.i(TAG, "Cannot load chromium_linker_test:" +  e);
         }
 
         // Now, start a new renderer process by creating a new view.
@@ -173,10 +173,6 @@ public class ContentLinkerTestActivity extends Activity {
         mWindowAndroid.onActivityResult(requestCode, resultCode, data);
     }
 
-    private static String getUrlFromIntent(Intent intent) {
-        return intent != null ? intent.getDataString() : null;
-    }
-
     private static String[] getCommandLineParamsFromIntent(Intent intent) {
         return intent != null ? intent.getStringArrayExtra(COMMAND_LINE_ARGS_KEY) : null;
     }