Upstream some more content/ DEPS-related cleanup.

content/app/android/content_jni_registrar.cc

Index: content/app/android/content_jni_registrar.cc
diff --git a/content/app/android/content_jni_registrar.cc b/content/app/android/content_jni_registrar.cc
index fb509c102c458dc4f49d09a73221635d2ff5f4cd..86b19ed29336dde587d3155a1c009bf22f8b4bd9 100644
--- a/content/app/android/content_jni_registrar.cc
+++ b/content/app/android/content_jni_registrar.cc
@@ -9,28 +9,30 @@
 #include "content/app/android/content_main.h"
 #include "content/app/android/sandboxed_process_service.h"
 #include "content/browser/android/android_browser_process.h"
-#include "content/browser/android/command_line.h"
 #include "content/browser/android/content_view_client.h"
+#include "content/browser/android/content_view_impl.h"
 #include "content/browser/android/device_info.h"
 #include "content/browser/android/download_controller.h"
-#include "content/browser/android/jni_helper.h"
 #include "content/browser/android/sandboxed_process_launcher.h"
-#include "content/browser/android/trace_event_binding.h"
-#include "content/browser/android/content_view_impl.h"
+#include "content/common/android/command_line.h"
 #include "content/common/android/surface_callback.h"
+#include "content/common/android/trace_event_binding.h"
+#include "content/public/browser/android/bitmap_holder.h"
+
+bool RegisterBitmapHolder(JNIEnv* env);
 
 namespace content {
 namespace android {
 
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
+  { "BitmapHolder", RegisterBitmapHolder },
   { "CommandLine", RegisterCommandLine },
   { "ContentView", RegisterContentView },
   { "ContentViewClient", RegisterContentViewClient },
   { "ContentMain", content::RegisterContentMain },
   { "DeviceInfo", RegisterDeviceInfo },
   { "DownloadController", DownloadController::RegisterDownloadController },
-  { "JniHelper", RegisterJniHelper },
   { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
   { "SandboxedProcessService", content::RegisterSandboxedProcessService },
   { "SurfaceCallback", content::RegisterSurfaceCallback },