Upstream some more content/ DEPS-related cleanup.

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 9916d15584ffd4e5011c52cad06f824142fe4476..9da7e08271491bca2af77c9004d35657f4d07577 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -30,6 +30,7 @@
   'sources': [
     'port/browser/render_view_host_delegate_view.h',
     'port/browser/render_widget_host_view_port.h',
+    'public/browser/android/bitmap_holder.h',
     'public/browser/access_token_store.h',
     'public/browser/browser_accessibility_state.h',
     'public/browser/browser_child_process_host.h',
@@ -186,18 +187,13 @@
     'browser/accessibility/browser_accessibility_win.h',
     'browser/android/android_browser_process.cc',
     'browser/android/android_browser_process.h',
-    'browser/android/command_line.cc',
-    'browser/android/command_line.h',
+    'browser/android/bitmap_holder.cc',
     'browser/android/device_info.cc',
     'browser/android/device_info.h',
     'browser/android/download_controller.cc',
     'browser/android/download_controller.h',
-    'browser/android/jni_helper.cc',
-    'browser/android/jni_helper.h',
     'browser/android/sandboxed_process_launcher.cc',
     'browser/android/sandboxed_process_launcher.h',
-    'browser/android/trace_event_binding.cc',
-    'browser/android/trace_event_binding.h',
     'browser/appcache/appcache_dispatcher_host.cc',
     'browser/appcache/appcache_dispatcher_host.h',
     'browser/appcache/appcache_frontend_proxy.cc',