base / jni_generator_helper: Remove unnecessary trace_event.h include

And add a bunch of missing includes elsewhere that were breaking the
build afterwards.

Change-Id: Ice45b155083b9b37281c7d28e6787a97dd4c5ea1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210981Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771768}

base/android/application_status_listener.cc

@@ -10,6 +10,7 @@
 #include "base/lazy_instance.h"
 #include "base/metrics/user_metrics.h"
 #include "base/observer_list_threadsafe.h"
+#include "base/trace_event/trace_event.h"
 
 namespace base {
 namespace android {

base/android/java_exception_reporter.cc

@@ -9,7 +9,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/base_jni_headers/JavaExceptionReporter_jni.h"
 #include "base/bind.h"
-#include "base/callback_forward.h"
+#include "base/callback.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/lazy_instance.h"
 

base/android/jni_generator/jni_generator_helper.h

@@ -13,7 +13,6 @@
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 
 // Project-specific macros used by the header files generated by

components/crash/android/crash_keys_android.cc

@@ -6,6 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/stl_util.h"
 #include "components/crash/android/jni_headers/CrashKeys_jni.h"
 #include "components/crash/core/common/crash_key.h"
 

components/query_tiles/android/tile_provider_bridge.cc

@@ -10,6 +10,7 @@
 
 #include "base/android/callback_android.h"
 #include "base/android/jni_string.h"
+#include "base/bind.h"
 #include "components/query_tiles/android/tile_conversion_bridge.h"
 #include "components/query_tiles/jni_headers/TileProviderBridge_jni.h"
 #include "ui/gfx/android/java_bitmap.h"

components/search_engines/android/template_url_service_android.cc

@@ -15,6 +15,7 @@
 #include "base/feature_list.h"
 #include "base/format_macros.h"
 #include "base/metrics/field_trial_params.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/google/core/common/google_util.h"
 #include "components/search_engines/android/jni_headers/TemplateUrlService_jni.h"

media/capture/video/android/video_capture_device_android.cc

@@ -14,6 +14,7 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
 #include "media/capture/mojom/image_capture_types.h"
 #include "media/capture/video/android/capture_jni_headers/VideoCapture_jni.h"
 #include "media/capture/video/android/photo_capabilities.h"

weblayer/public/tab.h

@@ -6,6 +6,7 @@
 #define WEBLAYER_PUBLIC_TAB_H_
 
 #include <algorithm>
+#include <map>
 #include <string>
 
 #include "base/callback_forward.h"