Upstream some more content/ DEPS-related cleanup.

content/content_jni.gypi

Index: content/content_jni.gypi
diff --git a/content/content_jni.gypi b/content/content_jni.gypi
index ca733f6269d122e82354260630e89b386dbb84c7..0a97966ddb20b301f8a41dd1ada8968830f5c5dd 100644
--- a/content/content_jni.gypi
+++ b/content/content_jni.gypi
@@ -10,37 +10,35 @@
   'variables': {
     'java_sources': [
       'public/android/java/org/chromium/content/app/ContentMain.java',
+      'public/android/java/org/chromium/content/app/LibraryLoader.java',
       'public/android/java/org/chromium/content/app/SandboxedProcessService.java',
       'public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java',
-      'public/android/java/org/chromium/content/browser/CommandLine.java',
       'public/android/java/org/chromium/content/browser/ContentView.java',
       'public/android/java/org/chromium/content/browser/ContentViewClient.java',
       'public/android/java/org/chromium/content/browser/DeviceInfo.java',
       'public/android/java/org/chromium/content/browser/DeviceOrientation.java',
       'public/android/java/org/chromium/content/browser/DownloadController.java',
-      'public/android/java/org/chromium/content/browser/JNIHelper.java',
-      'public/android/java/org/chromium/content/browser/LibraryLoader.java',
       'public/android/java/org/chromium/content/browser/LocationProvider.java',
       'public/android/java/org/chromium/content/browser/SandboxedProcessLauncher.java',
-      'public/android/java/org/chromium/content/browser/TraceEvent.java',
+      'public/android/java/org/chromium/content/common/CommandLine.java',
       'public/android/java/org/chromium/content/common/SurfaceCallback.java',
+      'public/android/java/org/chromium/content/common/TraceEvent.java',
     ],
     'jni_headers': [
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_main_jni.h',
+      '<(SHARED_INTERMEDIATE_DIR)/content/jni/library_loader_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_service_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_info_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_orientation_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/download_controller_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/jni_helper_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/library_loader_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_launcher_jni.h',
-      '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h',
+      '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_callback_jni.h',
+      '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h',
     ],
   },
   'includes': [ '../build/jni_generator.gypi' ],