| Index: chromecast/shell/app/android/cast_jni_loader.cc
 | 
| diff --git a/content/shell/android/linker_test_apk/chromium_linker_test_android.cc b/chromecast/shell/app/android/cast_jni_loader.cc
 | 
| similarity index 67%
 | 
| copy from content/shell/android/linker_test_apk/chromium_linker_test_android.cc
 | 
| copy to chromecast/shell/app/android/cast_jni_loader.cc
 | 
| index 5173128dc8a8ff5f81316a48a87ef0e56716e99e..4cbf8f8e15446ba625a4ebe4cf9809189e9634e7 100644
 | 
| --- a/content/shell/android/linker_test_apk/chromium_linker_test_android.cc
 | 
| +++ b/chromecast/shell/app/android/cast_jni_loader.cc
 | 
| @@ -8,33 +8,29 @@
 | 
|  #include "base/basictypes.h"
 | 
|  #include "base/debug/debugger.h"
 | 
|  #include "base/logging.h"
 | 
| +#include "chromecast/android/cast_jni_registrar.h"
 | 
| +#include "chromecast/android/platform_jni_loader.h"
 | 
| +#include "chromecast/shell/app/cast_main_delegate.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/chromium_linker_test_linker_tests.h"
 | 
| -#include "content/shell/android/shell_jni_registrar.h"
 | 
| -#include "content/shell/app/shell_main_delegate.h"
 | 
|  
 | 
|  // This is called by the VM when the shared library is first loaded.
 | 
|  JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
 | 
| -
 | 
|    base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
 | 
| -
 | 
|    base::android::InitVM(vm);
 | 
|    JNIEnv* env = base::android::AttachCurrentThread();
 | 
|  
 | 
| -  if (!base::android::RegisterLibraryLoaderEntryHook(env))
 | 
| -    return -1;
 | 
| +  if (!base::android::RegisterLibraryLoaderEntryHook(env)) return -1;
 | 
|  
 | 
|    // To be called only from the UI thread.  If loading the library is done on
 | 
|    // a separate thread, this should be moved elsewhere.
 | 
| -  if (!content::android::RegisterShellJni(env))
 | 
| -    return -1;
 | 
| -
 | 
| -  if (!content::RegisterLinkerTestsJni(env))
 | 
| -    return -1;
 | 
| +  if (!chromecast::android::RegisterJni(env)) return -1;
 | 
| +  // Allow platform-specific implementations to perform more JNI registration.
 | 
| +  if (!chromecast::android::PlatformRegisterJni(env)) return -1;
 | 
|  
 | 
|    content::Compositor::Initialize();
 | 
| -  content::SetContentMainDelegate(new content::ShellMainDelegate());
 | 
| +  content::SetContentMainDelegate(new chromecast::shell::CastMainDelegate);
 | 
| +
 | 
|    return JNI_VERSION_1_4;
 | 
|  }
 | 
| 
 |