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 8db347d2bff8ea6fd7ee0cc8da476929e8ff568d..0f5592b18eadc0c6c71e911af6031b66b6bb7599 100644
--- a/content/app/android/content_jni_registrar.cc
+++ b/content/app/android/content_jni_registrar.cc
@@ -9,13 +9,15 @@
 #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/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/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 {
@@ -26,7 +28,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
   { "ContentMain", content::RegisterContentMain },
   { "DeviceInfo", RegisterDeviceInfo },
   { "DownloadController", DownloadController::RegisterDownloadController },
-  { "JniHelper", RegisterJniHelper },
+  { "BitmapHolder", RegisterBitmapHolder },

[Yaron, 2012/06/15 17:40:35]

Nit: sort

[no sievers, 2012/06/15 20:34:41]

Done.

   { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
   { "SandboxedProcessService", content::RegisterSandboxedProcessService },
   { "SurfaceCallback", content::RegisterSurfaceCallback },