Add context_utils.h includes where needed.

base::android::GetApplicationContext is now defined in context_utils.h. Update includes for files that use this, and stop including it in jni_android.h. BUG=552419 TBR=jochen@chromium.org,sky@chromium.org,xhwang@chromium.org,davidben@chromium.org,tedchoc@chromium.org,scheib@chromium.org,qinmin@chromium.org,halliwell@chromium.org,thakis@chromium.org Review URL: https://codereview.chromium.org/1475773002 Cr-Commit-Position: refs/heads/master@{#361701}
Denger-Network · Nov 25, 2015 · da6e7c9 · da6e7c9
1 parent 5f97c7a
commit da6e7c9
Show file tree

Hide file tree

Showing 72 changed files with 71 additions and 9 deletions.
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
@@ -8,6 +8,7 @@
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/native/input_stream_impl.h"
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"

diff --git a/base/android/apk_assets.cc b/base/android/apk_assets.cc
@@ -6,6 +6,7 @@
 
 #include "base/android/apk_assets.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"

diff --git a/base/android/build_info.cc b/base/android/build_info.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"

diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
@@ -4,6 +4,7 @@
 
 #include "base/android/content_uri_utils.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "jni/ContentUriUtils_jni.h"

diff --git a/base/android/jni_android.h b/base/android/jni_android.h
@@ -10,9 +10,6 @@
 
 #include <string>
 
-// TODO(torne): remove this when callers of GetApplicationContext have been
-// fixed to include context_utils.h. http://crbug.com/552419
-#include "base/android/context_utils.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/atomicops.h"
 #include "base/base_export.h"

diff --git a/base/android/memory_pressure_listener_android.cc b/base/android/memory_pressure_listener_android.cc
@@ -4,6 +4,7 @@
 
 #include "base/android/memory_pressure_listener_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "jni/MemoryPressureListener_jni.h"
 

diff --git a/base/android/path_utils.cc b/base/android/path_utils.cc
@@ -4,6 +4,7 @@
 
 #include "base/android/path_utils.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"

diff --git a/base/test/test_file_util_android.cc b/base/test/test_file_util_android.cc
@@ -4,6 +4,7 @@
 
 #include "base/test/test_file_util.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"

diff --git a/chrome/browser/android/accessibility_util.cc b/chrome/browser/android/accessibility_util.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "chrome/browser/android/accessibility_util.h"
 #include "jni/AccessibilityUtil_jni.h"

diff --git a/chrome/browser/android/background_sync_launcher_android.cc b/chrome/browser/android/background_sync_launcher_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/background_sync_launcher_android.h"
 
+#include "base/android/context_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/BackgroundSyncLauncher_jni.h"
 

diff --git a/chrome/browser/android/chrome_application.cc b/chrome/browser/android/chrome_application.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"

diff --git a/chrome/browser/android/data_usage/external_data_use_observer.cc b/chrome/browser/android/data_usage/external_data_use_observer.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
 #include "base/containers/hash_tables.h"
 #include "base/message_loop/message_loop.h"

diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
@@ -7,6 +7,7 @@
 #include <pwd.h>
 #include <cstring>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/bind.h"

diff --git a/chrome/browser/android/intent_helper.cc b/chrome/browser/android/intent_helper.cc
@@ -6,6 +6,7 @@
 
 #include <jni.h>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"

diff --git a/chrome/browser/android/net/external_estimate_provider_android.cc b/chrome/browser/android/net/external_estimate_provider_android.cc
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 
+#include "base/android/context_utils.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/ExternalEstimateProviderAndroid_jni.h"

diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
@@ -6,6 +6,7 @@
 
 #include <jni.h>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/chrome/browser/android/signin/account_management_screen_helper.cc b/chrome/browser/android/signin/account_management_screen_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/android/signin/account_management_screen_helper.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/profiles/profile.h"

diff --git a/chrome/browser/android/webapps/webapp_registry.cc b/chrome/browser/android/webapps/webapp_registry.cc
@@ -6,6 +6,7 @@
 
 #include <jni.h>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/callback.h"
 #include "chrome/browser/io_thread.h"

diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -30,7 +30,7 @@
 #include "net/url_request/url_request_context_getter.h"
 
 #if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
+#include "base/android/context_utils.h"
 #include "components/invalidation/impl/invalidation_service_android.h"
 #endif  // defined(OS_ANDROID)
 

diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/media/android/router/media_router_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/chrome/browser/media/android/router/media_router_dialog_controller_android.cc b/chrome/browser/media/android/router/media_router_dialog_controller_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/media/android/router/media_router_dialog_controller_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/media/android/router/media_router_android.h"

diff --git a/chrome/browser/notifications/notification_ui_manager_android.cc b/chrome/browser/notifications/notification_ui_manager_android.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"

diff --git a/chrome/browser/signin/oauth2_token_service_delegate_android.cc b/chrome/browser/signin/oauth2_token_service_delegate_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/chrome/browser/speech/tts_android.cc b/chrome/browser/speech/tts_android.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"

diff --git a/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc b/chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/memory/scoped_ptr.h"

diff --git a/chromecast/app/android/crash_handler.cc b/chromecast/app/android/crash_handler.cc
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <string>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"

diff --git a/chromecast/base/android/system_time_change_notifier_android.cc b/chromecast/base/android/system_time_change_notifier_android.cc
@@ -4,6 +4,7 @@
 
 #include "chromecast/base/android/system_time_change_notifier_android.h"
 
+#include "base/android/context_utils.h"
 #include "jni/SystemTimeChangeNotifierAndroid_jni.h"
 
 namespace chromecast {

diff --git a/chromecast/base/chromecast_config_android.cc b/chromecast/base/chromecast_config_android.cc
@@ -4,6 +4,7 @@
 
 #include "chromecast/base/chromecast_config_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/lazy_instance.h"
 #include "jni/ChromecastConfigAndroid_jni.h"

diff --git a/components/gcm_driver/gcm_driver_android.cc b/components/gcm_driver/gcm_driver_android.cc
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/components/invalidation/impl/invalidation_service_android_unittest.cc b/components/invalidation/impl/invalidation_service_android_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "components/invalidation/impl/invalidation_service_android.h"
 
-#include "base/android/jni_android.h"
+#include "base/android/context_utils.h"
 #include "components/invalidation/impl/fake_invalidation_handler.h"
 #include "components/invalidation/impl/invalidation_service_test_template.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/components/resource_provider/android/android_hooks.cc b/components/resource_provider/android/android_hooks.cc
@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "base/android/base_jni_onload.h"
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/bind.h"

diff --git a/components/service_tab_launcher/browser/android/service_tab_launcher.cc b/components/service_tab_launcher/browser/android/service_tab_launcher.cc
@@ -4,6 +4,7 @@
 
 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "content/public/browser/browser_context.h"

diff --git a/components/variations/android/variations_seed_bridge.cc b/components/variations/android/variations_seed_bridge.cc
@@ -7,6 +7,7 @@
 #include <jni.h>
 #include <vector>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/content/browser/android/background_sync_network_observer_android.cc b/content/browser/android/background_sync_network_observer_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/android/background_sync_network_observer_android.h"
 
+#include "base/android/context_utils.h"
 #include "jni/BackgroundSyncNetworkObserver_jni.h"
 
 namespace content {

diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/android/child_process_launcher_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"

diff --git a/content/browser/android/composited_touch_handle_drawable.cc b/content/browser/android/composited_touch_handle_drawable.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/android/composited_touch_handle_drawable.h"
 
+#include "base/android/context_utils.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"

diff --git a/content/browser/android/download_controller_android_impl.cc b/content/browser/android/download_controller_android_impl.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/android/download_controller_android_impl.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"

diff --git a/content/browser/device_sensors/sensor_manager_android.cc b/content/browser/device_sensors/sensor_manager_android.cc
@@ -6,6 +6,7 @@
 
 #include <string.h>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"

diff --git a/content/browser/geolocation/location_api_adapter_android.cc b/content/browser/geolocation/location_api_adapter_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/geolocation/location_api_adapter_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"

diff --git a/content/browser/media/android/media_resource_getter_impl.cc b/content/browser/media/android/media_resource_getter_impl.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/media/android/media_resource_getter_impl.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"

diff --git a/content/browser/media/android/media_session.cc b/content/browser/media/android/media_session.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/media/android/media_session.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "content/browser/media/android/media_session_observer.h"
 #include "content/browser/web_contents/web_contents_impl.h"

diff --git a/content/browser/media/android/media_throttler.cc b/content/browser/media/android/media_throttler.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/media/android/media_throttler.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "jni/MediaThrottler_jni.h"
 

diff --git a/content/browser/mojo/service_registrar_android.cc b/content/browser/mojo/service_registrar_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/mojo/service_registrar_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "content/browser/mojo/service_registry_android.h"
 #include "jni/ServiceRegistrar_jni.h"

diff --git a/content/browser/speech/speech_recognizer_impl_android.cc b/content/browser/speech/speech_recognizer_impl_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/speech/speech_recognizer_impl_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/content/browser/time_zone_monitor_android.cc b/content/browser/time_zone_monitor_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/time_zone_monitor_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "jni/TimeZoneMonitor_jni.h"
 

diff --git a/content/browser/vr/android/cardboard/cardboard_vr_device.cc b/content/browser/vr/android/cardboard/cardboard_vr_device.cc
@@ -7,6 +7,7 @@
 #include <math.h>
 #include <algorithm>
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

diff --git a/content/shell/browser/layout_test/layout_test_android.cc b/content/shell/browser/layout_test/layout_test_android.cc
@@ -4,6 +4,7 @@
 
 #include "content/shell/browser/layout_test/layout_test_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"

diff --git a/device/bluetooth/android/wrappers.cc b/device/bluetooth/android/wrappers.cc
@@ -4,6 +4,7 @@
 
 #include "device/bluetooth/android/wrappers.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "jni/Wrappers_jni.h"
 

diff --git a/device/bluetooth/bluetooth_device_android.cc b/device/bluetooth/bluetooth_device_android.cc
@@ -4,6 +4,7 @@
 
 #include "device/bluetooth/bluetooth_device_android.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"