diff options
| author | torne <torne@chromium.org> | 2015-11-25 10:25:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-25 18:27:27 +0000 |
| commit | da6e7c9eab6317710168ba6a2588f68621c8668f (patch) | |
| tree | c1a4e357e2067a7d2983a0656420fd21febec6d5 | |
| parent | 5f97c7a06a9b78797754a3fdd83d1f6169fb13c9 (diff) | |
| download | chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.zip chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.tar.gz chromium_src-da6e7c9eab6317710168ba6a2588f68621c8668f.tar.bz2 | |
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}
72 files changed, 71 insertions, 9 deletions
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc index 159534d..09e33bc 100644 --- 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 index fab7fd0..5319e73 100644 --- 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 index 68824b4..2d3ef27 100644 --- 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 index 0482fee..195598b 100644 --- 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 index 651005e..909e3da 100644 --- 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 index 9d3dd46..5975b94 100644 --- 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 index caad53a..85e29de 100644 --- 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 index b8fd50c..a272d67 100644 --- 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 index 1adb093..aa58d9b 100644 --- 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 index 76b151659..e63686b 100644 --- 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 index 1ae2f43..6614fc0 100644 --- 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 index 815acb0..5577427 100644 --- 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 index 904bcb7..fa440e3 100644 --- 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 index d3e6f6d..0e3ebd8 100644 --- 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 index 4a02f3b..5438b56 100644 --- 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 index 3e0ddc2..2d39daf 100644 --- 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 index 7aa2e94..da22c15 100644 --- 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 index e4466a3..588e3ad 100644 --- 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 index 80db303..354106b 100644 --- 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 index fe4c912..10e2889 100644 --- 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 index df69aee..a0b8e7a 100644 --- 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 index f7faddd..9943969 100644 --- 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 index 65f0b11..4bccc15 100644 --- 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 index bcc501c..dbec2f8 100644 --- 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 index 46f91c3..e20b033 100644 --- 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 index b4223f8..d13e38d 100644 --- 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 index cc3c25f..9278d2a 100644 --- 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 index 168faa2..238e345 100644 --- 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 index a0e04f7..bc24225 100644 --- 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 index 832f1fc..0cccb6d 100644 --- 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 index c84730f..4cf2687 100644 --- 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 index d68c3e0..9baee6e 100644 --- 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 index 9016692..bb90050 100644 --- 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 index 533fc36..fe13976 100644 --- 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 index 94ce411..a29e615 100644 --- 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 index 1eaafca..3b75992 100644 --- 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 index be0b901..e9baefe 100644 --- 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 index a108666..7c9f7c0 100644 --- 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 index 2396b55..4037ab6 100644 --- 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 index d8b51c9..69200e2 100644 --- 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 index 2a4dd1c..48ceb54 100644 --- 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 index 04c8030..e1769ec 100644 --- 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 index 30ea742..e29d7f3 100644 --- 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 index 1b8a07e..8b17017 100644 --- 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 index af57f80..8018cf7 100644 --- 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 index 378a855..620eb70 100644 --- 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 index f19d721..5b89e24 100644 --- 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 index 803a156..746eb25 100644 --- 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 index e817350..51d11fc 100644 --- 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" diff --git a/mandoline/services/core_services/android_hooks.cc b/mandoline/services/core_services/android_hooks.cc index 4448be6..beeab82 100644 --- a/mandoline/services/core_services/android_hooks.cc +++ b/mandoline/services/core_services/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/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc index 01379b8..8e95bfe 100644 --- a/media/audio/android/audio_manager_android.cc +++ b/media/audio/android/audio_manager_android.cc @@ -5,6 +5,7 @@ #include "media/audio/android/audio_manager_android.h" #include "base/android/build_info.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/media/base/android/media_player_android.cc b/media/base/android/media_player_android.cc index 9bde3de..ec0fe6a 100644 --- a/media/base/android/media_player_android.cc +++ b/media/base/android/media_player_android.cc @@ -4,7 +4,7 @@ #include "media/base/android/media_player_android.h" -#include "base/android/jni_android.h" +#include "base/android/context_utils.h" #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc index 4ec4419..335b190 100644 --- a/media/base/android/media_player_bridge.cc +++ b/media/base/android/media_player_bridge.cc @@ -4,6 +4,7 @@ #include "media/base/android/media_player_bridge.h" +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/basictypes.h" diff --git a/media/base/android/webaudio_media_codec_bridge.cc b/media/base/android/webaudio_media_codec_bridge.cc index 55996a3..7859cef 100644 --- a/media/base/android/webaudio_media_codec_bridge.cc +++ b/media/base/android/webaudio_media_codec_bridge.cc @@ -12,6 +12,7 @@ #include <unistd.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/media/capture/video/android/video_capture_device_factory_android.cc b/media/capture/video/android/video_capture_device_factory_android.cc index cce951b..485a256 100644 --- a/media/capture/video/android/video_capture_device_factory_android.cc +++ b/media/capture/video/android/video_capture_device_factory_android.cc @@ -4,6 +4,7 @@ #include "media/capture/video/android/video_capture_device_factory_android.h" +#include "base/android/context_utils.h" #include "base/android/jni_string.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" diff --git a/media/midi/midi_manager_android.cc b/media/midi/midi_manager_android.cc index e729358..8ce5127 100644 --- a/media/midi/midi_manager_android.cc +++ b/media/midi/midi_manager_android.cc @@ -5,6 +5,7 @@ #include "media/midi/midi_manager_android.h" #include "base/android/build_info.h" +#include "base/android/context_utils.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc index 0850ef4..9a7a422 100644 --- a/media/midi/usb_midi_device_factory_android.cc +++ b/media/midi/usb_midi_device_factory_android.cc @@ -4,7 +4,7 @@ #include "media/midi/usb_midi_device_factory_android.h" - +#include "base/android/context_utils.h" #include "base/bind.h" #include "base/containers/hash_tables.h" #include "base/lazy_instance.h" diff --git a/mojo/runner/android/android_handler.cc b/mojo/runner/android/android_handler.cc index 98313e3..ebf5953 100644 --- a/mojo/runner/android/android_handler.cc +++ b/mojo/runner/android/android_handler.cc @@ -4,6 +4,7 @@ #include "mojo/runner/android/android_handler.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/mojo/services/network/android_hooks.cc b/mojo/services/network/android_hooks.cc index 8f949f9..cb06741 100644 --- a/mojo/services/network/android_hooks.cc +++ b/mojo/services/network/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/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc index f8c112c..71aa166 100644 --- a/net/android/network_change_notifier_delegate_android.cc +++ b/net/android/network_change_notifier_delegate_android.cc @@ -4,6 +4,7 @@ #include "net/android/network_change_notifier_delegate_android.h" +#include "base/android/context_utils.h" #include "base/android/jni_array.h" #include "base/logging.h" #include "jni/NetworkChangeNotifier_jni.h" diff --git a/net/android/network_library.cc b/net/android/network_library.cc index f4bda87..eb2376e 100644 --- a/net/android/network_library.cc +++ b/net/android/network_library.cc @@ -4,6 +4,7 @@ #include "net/android/network_library.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/net/cert/x509_util_android.cc b/net/cert/x509_util_android.cc index 2a91f4a..447853e 100644 --- a/net/cert/x509_util_android.cc +++ b/net/cert/x509_util_android.cc @@ -5,7 +5,7 @@ #include "net/cert/x509_util_android.h" #include "base/android/build_info.h" -#include "base/android/jni_android.h" +#include "base/android/context_utils.h" #include "base/metrics/histogram_macros.h" #include "jni/X509Util_jni.h" #include "net/cert/cert_database.h" diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index 57ec512..3cd8317 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -6,6 +6,7 @@ #include <sys/system_properties.h> +#include "base/android/context_utils.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/basictypes.h" diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc index 9ff995c..eb652d9 100644 --- a/testing/android/native_test/native_test_launcher.cc +++ b/testing/android/native_test/native_test_launcher.cc @@ -13,8 +13,8 @@ #include <signal.h> #include "base/android/base_jni_registrar.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" #include "base/android/scoped_java_ref.h" #include "base/at_exit.h" diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc index 0ba6e6c..d75c8d4 100644 --- a/ui/android/window_android.cc +++ b/ui/android/window_android.cc @@ -4,6 +4,7 @@ #include "ui/android/window_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/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc index 1a0d0f9..6282058 100644 --- a/ui/base/clipboard/clipboard_android.cc +++ b/ui/base/clipboard/clipboard_android.cc @@ -4,6 +4,7 @@ #include "ui/base/clipboard/clipboard_android.h" +#include "base/android/context_utils.h" #include "base/android/jni_string.h" #include "base/lazy_instance.h" #include "base/stl_util.h" diff --git a/ui/base/clipboard/clipboard_android_unittest.cc b/ui/base/clipboard/clipboard_android_unittest.cc index 41ce552..b6744a2 100644 --- a/ui/base/clipboard/clipboard_android_unittest.cc +++ b/ui/base/clipboard/clipboard_android_unittest.cc @@ -4,6 +4,7 @@ #include "ui/base/clipboard/clipboard_android.h" +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ui/base/device_form_factor_android.cc b/ui/base/device_form_factor_android.cc index e7ed06b..9cc21ba 100644 --- a/ui/base/device_form_factor_android.cc +++ b/ui/base/device_form_factor_android.cc @@ -4,6 +4,7 @@ #include "ui/base/device_form_factor_android.h" +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "jni/DeviceFormFactor_jni.h" diff --git a/ui/base/touch/touch_device_android.cc b/ui/base/touch/touch_device_android.cc index 5754c65..2669f54 100644 --- a/ui/base/touch/touch_device_android.cc +++ b/ui/base/touch/touch_device_android.cc @@ -4,6 +4,7 @@ #include "ui/base/touch/touch_device.h" +#include "base/android/context_utils.h" #include "base/logging.h" #include "jni/TouchDevice_jni.h" diff --git a/ui/gfx/android/shared_device_display_info.cc b/ui/gfx/android/shared_device_display_info.cc index 5fb9aa1..228626f 100644 --- a/ui/gfx/android/shared_device_display_info.cc +++ b/ui/gfx/android/shared_device_display_info.cc @@ -4,6 +4,7 @@ #include "ui/gfx/android/shared_device_display_info.h" +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/logging.h" diff --git a/ui/gfx/android/view_configuration.cc b/ui/gfx/android/view_configuration.cc index df9581b..2f26756 100644 --- a/ui/gfx/android/view_configuration.cc +++ b/ui/gfx/android/view_configuration.cc @@ -4,6 +4,7 @@ #include "ui/gfx/android/view_configuration.h" +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "base/lazy_instance.h" #include "base/threading/non_thread_safe.h" diff --git a/ui/platform_window/android/platform_window_android.cc b/ui/platform_window/android/platform_window_android.cc index 49b6ba7..b9ee051 100644 --- a/ui/platform_window/android/platform_window_android.cc +++ b/ui/platform_window/android/platform_window_android.cc @@ -7,6 +7,7 @@ #include <android/input.h> #include <android/native_window_jni.h> +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "jni/PlatformWindowAndroid_jni.h" #include "ui/events/event.h" |