Revert "Mass refactoring: Change JNI #includes to use full paths (chromecast/)."

This reverts commit 748bea29.

Reason for revert: Causing compile failures on Android bots: https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/1626

Original change's description:
> Mass refactoring: Change JNI #includes to use full paths (chromecast/).
> 
> Using relative paths was causing build failures. To create this change:
>   * find out/Debug -name *_jni.h -delete
>   * find . -name BUILD.gn -exec sed -i '/jni_package =/d' {} \;
>   * ninja $CHROMECAST_JNI_HEADERS
>   * refactor_jni_includes.py  --out-dir out/Debug --repl-dir chromecast
>   * fix DEPs files manually
> 
> See https://groups.google.com/a/chromium.org/forum/?#!topic/java/MEovGrAwbqI
> for discussion on naming scheme.
> 
> Bug: 964169
> Change-Id: I8aa1c635183444363f6a485464c3953331036e13
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1672195
> Commit-Queue: Eric Stevenson <estevenson@chromium.org>
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#671682}

TBR=tedchoc@chromium.org,estevenson@chromium.org

Change-Id: I64c2b10d857d9736c61f95526745234a05e51b03
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 964169
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674051Reviewed-by: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#671697}

chromecast/app/android/crash_handler.cc

@@ -16,10 +16,10 @@
 #include "chromecast/app/android/cast_crash_reporter_client_android.h"
 #include "chromecast/base/chromecast_config_android.h"
 #include "chromecast/base/version.h"
-#include "chromecast/browser/jni_headers/CastCrashHandler_jni.h"
 #include "components/crash/content/app/crash_reporter_client.h"
 #include "components/crash/content/app/crashpad.h"
 #include "content/public/common/content_switches.h"
+#include "jni/CastCrashHandler_jni.h"
 
 namespace {
 

chromecast/base/BUILD.gn

@@ -353,6 +353,8 @@ if (is_android) {
       "java/src/org/chromium/chromecast/base/DumpstateWriter.java",
       "java/src/org/chromium/chromecast/base/SystemTimeChangeNotifierAndroid.java",
     ]
+
+    jni_package = "chromecast"
   }
 
   android_library("base_java") {

chromecast/base/DEPS

 include_rules = [
-  "+chromecast/base/jni_headers",
-  "+chromecast/browser/jni_headers",
+  "+jni",
 ]

chromecast/base/android/dumpstate_writer.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "chromecast/base/jni_headers/DumpstateWriter_jni.h"
+#include "jni/DumpstateWriter_jni.h"
 
 namespace chromecast {
 

chromecast/base/android/system_time_change_notifier_android.cc

@@ -4,7 +4,7 @@
 
 #include "chromecast/base/android/system_time_change_notifier_android.h"
 
-#include "chromecast/base/jni_headers/SystemTimeChangeNotifierAndroid_jni.h"
+#include "jni/SystemTimeChangeNotifierAndroid_jni.h"
 
 using base::android::JavaParamRef;
 

chromecast/base/cast_sys_info_android.cc

@@ -16,8 +16,8 @@
 #include "base/system/sys_info.h"
 #include "chromecast/base/cast_sys_info_util.h"
 #include "chromecast/base/version.h"
-#include "chromecast/browser/jni_headers/CastSysInfoAndroid_jni.h"
 #include "chromecast/chromecast_buildflags.h"
+#include "jni/CastSysInfoAndroid_jni.h"
 
 namespace chromecast {
 

chromecast/base/cast_sys_info_android_things.cc

@@ -8,7 +8,7 @@
 #include "chromecast/chromecast_buildflags.h"
 #if BUILDFLAG(IS_ANDROID_THINGS_NON_PUBLIC)
 #include "base/android/jni_array.h"
-#include "chromecast/browser/jni_headers/CastSysInfoAndroid_jni.h"
+#include "jni/CastSysInfoAndroidThings_jni.h"
 #endif
 
 namespace chromecast {

chromecast/browser/BUILD.gn

@@ -551,6 +551,8 @@ if (is_android) {
     if (is_android_things_non_public) {
       sources += [ "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroidThings.java" ]
     }
+
+    jni_package = "chromecast"
   }
 
   java_cpp_enum("java_enums") {

chromecast/browser/android/BUILD.gn

@@ -184,6 +184,7 @@ if (is_android_things_non_public && !build_for_android_things_n) {
     deps = [
       "//chromecast/internal/android/prebuilt/things:support_lib_java",
     ]
+    jni_package = "chromecast"
   }
 }
 

chromecast/browser/android/cast_content_window_android.cc

@@ -11,8 +11,8 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "chromecast/browser/jni_headers/CastContentWindowAndroid_jni.h"
 #include "content/public/browser/web_contents.h"
+#include "jni/CastContentWindowAndroid_jni.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 
 namespace chromecast {

chromecast/browser/android/cast_metrics_helper_android.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chromecast/base/metrics/cast_metrics_helper.h"
-#include "chromecast/browser/jni_headers/CastMetricsHelper_jni.h"
+#include "jni/CastMetricsHelper_jni.h"
 
 using base::android::JavaParamRef;
 

chromecast/media/cma/backend/android/BUILD.gn

@@ -52,6 +52,8 @@ generate_jni("audio_track_jni_headers") {
       "java/src/org/chromium/chromecast/cma/backend/android/VolumeMap.java",
     ]
   }
+
+  jni_package = "audio_track"
 }
 
 android_library("audio_track_java") {

chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.cc

@@ -14,8 +14,8 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "chromecast/media/cma/backend/android/audio_track_jni_headers/AudioSinkAudioTrackImpl_jni.h"
 #include "chromecast/media/cma/base/decoder_buffer_base.h"
+#include "jni/AudioSinkAudioTrackImpl_jni.h"
 #include "media/base/audio_bus.h"
 
 #define RUN_ON_FEEDER_THREAD(callback, ...)                               \

chromecast/media/cma/backend/android/volume_control_android.cc

@@ -22,7 +22,7 @@
 #include "chromecast/base/init_command_line_shlib.h"
 #include "chromecast/base/serializers.h"
 #include "chromecast/chromecast_buildflags.h"
-#include "chromecast/media/cma/backend/android/audio_track_jni_headers/VolumeControl_jni.h"
+#include "jni/VolumeControl_jni.h"
 #if BUILDFLAG(ENABLE_VOLUME_TABLES_ACCESS)
 #include "jni/VolumeMap_jni.h"
 #endif