Upstream some more content/ DEPS-related cleanup.

content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     'browser/debugger/devtools_resources.gyp:devtools_resources',
     'browser/speech/proto/speech_proto.gyp:speech_proto',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
@@ skipping 12 matching lines @@
     '../webkit/support/webkit_support.gyp:webkit_resources',
     '../webkit/support/webkit_support.gyp:webkit_strings',
   ],
   'include_dirs': [
     '..',
     '<(INTERMEDIATE_DIR)',
   ],
   'sources': [
     'port/browser/render_view_host_delegate_view.h',
     'port/browser/render_widget_host_view_port.h',
+    'public/browser/android/bitmap_holder.h',

[Ted C, 2012/06/15 20:52:17]

Last I talked about this with jam, he preferred not to have an android
directory.  Instead something like a prefix would be ok
(android_bitmap_holder.h) but maybe things have changed.

     'public/browser/access_token_store.h',
     'public/browser/browser_accessibility_state.h',
     'public/browser/browser_child_process_host.h',
     'public/browser/browser_child_process_host_delegate.cc',
     'public/browser/browser_child_process_host_delegate.h',
     'public/browser/browser_child_process_host_iterator.cc',
     'public/browser/browser_child_process_host_iterator.h',
     'public/browser/browser_context.h',
     'public/browser/browser_main_parts.cc',
     'public/browser/browser_main_parts.h',
@@ skipping 137 matching lines @@
     'browser/accessibility/browser_accessibility_manager_mac.h',
     'browser/accessibility/browser_accessibility_manager_mac.mm',
     'browser/accessibility/browser_accessibility_manager_win.cc',
     'browser/accessibility/browser_accessibility_manager_win.h',
     'browser/accessibility/browser_accessibility_state_impl.cc',
     'browser/accessibility/browser_accessibility_state_impl.h',
     'browser/accessibility/browser_accessibility_win.cc',
     '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/content_startup_flags.cc',
     'browser/android/content_startup_flags.h',
     'browser/android/content_util.cc',
     'browser/android/content_util.h',
     'browser/android/content_view_impl.cc',
     'browser/android/content_view_impl.h',
     'browser/android/content_view_client.cc',
     'browser/android/content_view_client.h',
     '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',
     'browser/appcache/appcache_frontend_proxy.h',
     'browser/appcache/chrome_appcache_service.cc',
     'browser/appcache/chrome_appcache_service.h',
     'browser/browser_child_process_host_impl.cc',
     'browser/browser_child_process_host_impl.h',
     'browser/browser_context.cc',
     'browser/browser_main.cc',
@@ skipping 749 matching lines @@
       ],
     }],
     ['input_speech==0', {
       'sources/': [
         ['exclude', '^browser/speech/'],
       ],
     }],
   ],
 }