Android: Add chrome-specific dynamic linker.

content/shell/android/linker_test_apk/content_linker_test_android.cc

Index: content/shell/android/linker_test_apk/content_linker_test_android.cc
diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/linker_test_apk/content_linker_test_android.cc
similarity index 84%
copy from content/shell/android/shell_library_loader.cc
copy to content/shell/android/linker_test_apk/content_linker_test_android.cc
index 599e42177795038565709abc762694d0db244e27..77655dbf4035f0a260aea726088474a651e1dd62 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/linker_test_apk/content_linker_test_android.cc
@@ -1,15 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
 #include "base/basictypes.h"
 #include "base/debug/debugger.h"
 #include "base/logging.h"
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/android/compositor.h"
+#include "content/shell/android/linker_test_apk/content_linker_test_linker_tests.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "content/shell/app/shell_main_delegate.h"
 
@@ -26,6 +27,9 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   if (!content::android::RegisterShellJni(env))
     return -1;
 
+  if (!content::RegisterLinkerTestsJni(env))
+    return -1;
+
   content::Compositor::Initialize();
   content::SetContentMainDelegate(new content::ShellMainDelegate());
   return JNI_VERSION_1_4;