diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:35:24 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:35:24 +0000 |
commit | fb441961d60063478f9c4e8cf57b9968f28e6aef (patch) | |
tree | 87666bee60c026723969d4749e6d3500467194c4 /chrome | |
parent | a15385f81cdeab34ce44b2f7648a162fcea371a3 (diff) | |
download | chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.zip chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.tar.gz chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.tar.bz2 |
Revert 198844 "Move sequenced_task_runner to base/task"
Reverting revisions that rely on r198820 so to unbreak the build.
> Move sequenced_task_runner to base/task
>
> BUG=
> R=akalin@chromium.org
>
> Review URL: https://codereview.chromium.org/14927008
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/14985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
65 files changed, 65 insertions, 65 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index d4993a8..ebb1d0e 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -21,8 +21,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/string16.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/common/automation_constants.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index b5accc4..bed5996 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -15,8 +15,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "base/values.h" #include "chrome/browser/automation/automation_provider_json.h" #include "chrome/browser/automation/automation_tab_helper.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index c749b6a7..73e957e 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -20,8 +20,8 @@ #include "base/prefs/pref_service.h" #include "base/process.h" #include "base/process_util.h" +#include "base/sequenced_task_runner.h" #include "base/stringprintf.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 59c2bef..1985c64 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -11,8 +11,8 @@ #include "base/bind_helpers.h" #include "base/i18n/string_compare.h" #include "base/json/json_string_value_serializer.h" +#include "base/sequenced_task_runner.h" #include "base/string_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper.h b/chrome/browser/browsing_data/browsing_data_quota_helper.h index 9e3dbf0..86332a3 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper.h +++ b/chrome/browser/browsing_data/browsing_data_quota_helper.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "webkit/quota/quota_types.h" class BrowsingDataQuotaHelper; diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index 2ea4e70..2abe9e2 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h @@ -11,8 +11,8 @@ #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/prefs/pref_member.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event_watcher.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "base/time.h" #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/chromeos/contacts/contact_database.cc b/chrome/browser/chromeos/contacts/contact_database.cc index 2d52800..0b1193f 100644 --- a/chrome/browser/chromeos/contacts/contact_database.cc +++ b/chrome/browser/chromeos/contacts/contact_database.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/metrics/histogram.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc index b6d363df..23d1329 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc @@ -9,7 +9,7 @@ #include "base/callback_helpers.h" #include "base/logging.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_reader.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index 84bea19..54219ac 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -12,7 +12,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/rand_util.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/thread.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_reader.h" diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc index bb7e3ae..b60765f 100644 --- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread.h" #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" diff --git a/chrome/browser/chromeos/drive/file_cache_metadata.cc b/chrome/browser/chromeos/drive/file_cache_metadata.cc index 8ab4cf3..244df4b 100644 --- a/chrome/browser/chromeos/drive/file_cache_metadata.cc +++ b/chrome/browser/chromeos/drive/file_cache_metadata.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/files/file_enumerator.h" #include "base/metrics/histogram.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_util.h" diff --git a/chrome/browser/chromeos/drive/file_reader.cc b/chrome/browser/chromeos/drive/file_reader.cc index 9e0f640..1b12e7a 100644 --- a/chrome/browser/chromeos/drive/file_reader.cc +++ b/chrome/browser/chromeos/drive/file_reader.cc @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/platform_file.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/chromeos/drive/file_system/drive_operations.h b/chrome/browser/chromeos/drive/file_system/drive_operations.h index c245bfd..4c8c3a9 100644 --- a/chrome/browser/chromeos/drive/file_system/drive_operations.h +++ b/chrome/browser/chromeos/drive/file_system/drive_operations.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_DRIVE_OPERATIONS_H_ #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index ec49f5e..8e3c45a 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -10,8 +10,8 @@ #include <vector> #include "base/message_loop.h" +#include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_cache.h" diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h index a253f0d..60dc3d7 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h @@ -10,7 +10,7 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/thread_checker.h" #include "base/values.h" #include "chromeos/ime/component_extension_ime_manager.h" diff --git a/chrome/browser/chromeos/input_method/input_method_configuration.h b/chrome/browser/chromeos/input_method/input_method_configuration.h index 166de06..6d56ce2 100644 --- a/chrome/browser/chromeos/input_method/input_method_configuration.h +++ b/chrome/browser/chromeos/input_method/input_method_configuration.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONFIGURATION_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONFIGURATION_H_ -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/login/screen_locker.h b/chrome/browser/chromeos/login/screen_locker.h index a34a138..ec560a7 100644 --- a/chrome/browser/chromeos/login/screen_locker.h +++ b/chrome/browser/chromeos/login/screen_locker.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index b58e53b..6131c73 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -32,12 +32,12 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/sha1.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/sys_byteorder.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "chrome/browser/chromeos/web_socket_proxy_helper.h" #include "chrome/browser/internal_auth.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h index 87169c0..063d0df 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.h +++ b/chrome/browser/custom_handlers/protocol_handler_registry.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc index b4b7c93..f6d5d1b 100644 --- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/extensions/api/storage/settings_backend.h" #include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index ad2006b3..8929506 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -13,9 +13,9 @@ #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index 7439361..18e56b4 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/process.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/extensions/extension_function_histogram_value.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index d81f4fb..b0a4ee7 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/utf_string_conversions.h" // TODO(viettrungluu): delete me. #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 0747905..5b12d01 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -13,8 +13,8 @@ #include "base/prefs/json_pref_store.h" #include "base/prefs/pref_value_store.h" #include "base/run_loop.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/extensions/extension_pref_value_map.h" diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index a07769c..049027e 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -16,12 +16,12 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/run_loop.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/extensions/blacklist.h" diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc index cf19f1c..5b921de 100644 --- a/chrome/browser/managed_mode/managed_mode.cc +++ b/chrome/browser/managed_mode/managed_mode.cc @@ -8,7 +8,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" #include "chrome/browser/policy/url_blacklist_manager.h" diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc index f60b60e..f97dd31 100644 --- a/chrome/browser/managed_mode/managed_user_service.cc +++ b/chrome/browser/managed_mode/managed_user_service.cc @@ -6,7 +6,7 @@ #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h" diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc index 6270de7..6fb69c6 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/media_galleries/fileapi/media_path_filter.h" #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h" #include "webkit/blob/local_file_stream_reader.h" diff --git a/chrome/browser/media_galleries/scoped_mtp_device_map_entry.h b/chrome/browser/media_galleries/scoped_mtp_device_map_entry.h index 701f228..abcf042 100644 --- a/chrome/browser/media_galleries/scoped_mtp_device_map_entry.h +++ b/chrome/browser/media_galleries/scoped_mtp_device_map_entry.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" namespace chrome { diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc index a7c9a3f..a89dc8a 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc @@ -14,10 +14,10 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_split.h" -#include "base/task/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/net/network_time_tracker.cc b/chrome/browser/net/network_time_tracker.cc index 2154ff1..1334fb6 100644 --- a/chrome/browser/net/network_time_tracker.cc +++ b/chrome/browser/net/network_time_tracker.cc @@ -4,7 +4,7 @@ #include "chrome/browser/net/network_time_tracker.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index d53db6c..01077a2 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/prefs/pref_service.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/utf_string_conversions.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index 2419721..9eaafe1 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/common/content_settings.h" #include "content/public/browser/browser_message_filter.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.cc b/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.cc index 8222612..30565c6 100644 --- a/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.cc +++ b/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" #include "chrome/browser/policy/cloud/cloud_policy_constants.h" diff --git a/chrome/browser/policy/cloud/component_cloud_policy_service.cc b/chrome/browser/policy/cloud/component_cloud_policy_service.cc index 36e6bca..1365796 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_service.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_service.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/pickle.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "chrome/browser/policy/cloud/component_cloud_policy_store.h" #include "chrome/browser/policy/cloud/component_cloud_policy_updater.h" #include "chrome/browser/policy/cloud/resource_cache.h" diff --git a/chrome/browser/policy/cloud/component_cloud_policy_updater.cc b/chrome/browser/policy/cloud/component_cloud_policy_updater.cc index cde1e07..df76200 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_updater.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_updater.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "chrome/browser/policy/cloud/component_cloud_policy_store.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h" diff --git a/chrome/browser/policy/cloud/component_cloud_policy_updater_unittest.cc b/chrome/browser/policy/cloud/component_cloud_policy_updater_unittest.cc index 9507410..6cdecb9 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_updater_unittest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_updater_unittest.cc @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" +#include "base/sequenced_task_runner.h" #include "base/sha1.h" -#include "base/task/sequenced_task_runner.h" #include "base/test/test_simple_task_runner.h" #include "base/values.h" #include "chrome/browser/policy/cloud/cloud_policy_constants.h" diff --git a/chrome/browser/policy/cloud/external_policy_data_updater.cc b/chrome/browser/policy/cloud/external_policy_data_updater.cc index f069df6..a987e43 100644 --- a/chrome/browser/policy/cloud/external_policy_data_updater.cc +++ b/chrome/browser/policy/cloud/external_policy_data_updater.cc @@ -10,9 +10,9 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/sequenced_task_runner.h" #include "base/sha1.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "googleurl/src/gurl.h" #include "net/base/backoff_entry.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/policy/cloud/rate_limiter.cc b/chrome/browser/policy/cloud/rate_limiter.cc index 7dcd7c8..b0992a6 100644 --- a/chrome/browser/policy/cloud/rate_limiter.cc +++ b/chrome/browser/policy/cloud/rate_limiter.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/time/tick_clock.h" namespace policy { diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h index f7eb339..06a14c7 100644 --- a/chrome/browser/printing/print_dialog_gtk.h +++ b/chrome/browser/printing/print_dialog_gtk.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" #include "printing/print_dialog_gtk_interface.h" #include "printing/printing_context_gtk.h" diff --git a/chrome/browser/printing/print_system_task_proxy.h b/chrome/browser/printing/print_system_task_proxy.h index 981a9c2..33c6945 100644 --- a/chrome/browser/printing/print_system_task_proxy.h +++ b/chrome/browser/printing/print_system_task_proxy.h @@ -10,7 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index 20b8b7a..d77e083 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -68,12 +68,12 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/safe_strerror_posix.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index b7c2a08..0b9b5fc 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/worker_pool.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" diff --git a/chrome/browser/profiles/refcounted_profile_keyed_service.h b/chrome/browser/profiles/refcounted_profile_keyed_service.h index 1148500..a7c41af 100644 --- a/chrome/browser/profiles/refcounted_profile_keyed_service.h +++ b/chrome/browser/profiles/refcounted_profile_keyed_service.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PROFILES_REFCOUNTED_PROFILE_KEYED_SERVICE_H_ #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" class RefcountedProfileKeyedService; diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 3f25b52..1c160c0 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/content_settings.h" #include "content/public/browser/browser_message_filter.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h index 208dcc4..9a4ba3b 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.h +++ b/chrome/browser/safe_browsing/browser_feature_extractor.h @@ -20,7 +20,7 @@ #include "base/callback.h" #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 52fcc06..d9107dd 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/browser_feature_extractor.h" diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 4638df9..fb18d94 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -10,11 +10,11 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/safe_browsing/malware_details_history.h b/chrome/browser/safe_browsing/malware_details_history.h index e4fda3f..4665d02 100644 --- a/chrome/browser/safe_browsing/malware_details_history.h +++ b/chrome/browser/safe_browsing/malware_details_history.h @@ -14,7 +14,7 @@ #include "base/hash_tables.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/history/history_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 3117802..4e6fcdd4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -16,7 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc index 8e222c6..af77e8f 100644 --- a/chrome/browser/search_engines/search_provider_install_data.cc +++ b/chrome/browser/search_engines/search_provider_install_data.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/search_host_to_urls_map.h" diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.h b/chrome/browser/storage_monitor/volume_mount_watcher_win.h index cf4e587..3395416 100644 --- a/chrome/browser/storage_monitor/volume_mount_watcher_win.h +++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.h @@ -14,8 +14,8 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" +#include "base/sequenced_task_runner.h" #include "base/string16.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/storage_monitor.h" diff --git a/chrome/browser/sync/glue/android_invalidator_bridge.h b/chrome/browser/sync/glue/android_invalidator_bridge.h index b921caa..ec1baae 100644 --- a/chrome/browser/sync/glue/android_invalidator_bridge.h +++ b/chrome/browser/sync/glue/android_invalidator_bridge.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "sync/notifier/invalidator.h" diff --git a/chrome/browser/sync/glue/android_invalidator_bridge_unittest.cc b/chrome/browser/sync/glue/android_invalidator_bridge_unittest.cc index 26d23d6..bdf1acc 100644 --- a/chrome/browser/sync/glue/android_invalidator_bridge_unittest.cc +++ b/chrome/browser/sync/glue/android_invalidator_bridge_unittest.cc @@ -15,7 +15,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/run_loop.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/thread.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/profile_mock.h" diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h index 7450a24..7df8eed 100644 --- a/chrome/browser/sync/glue/data_type_controller.h +++ b/chrome/browser/sync/glue/data_type_controller.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/location.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/sync/glue/data_type_error_handler.h" #include "content/public/browser/browser_thread.h" #include "sync/api/sync_merge_result.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc index a10d58e..b5b7089 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store.cc @@ -12,10 +12,10 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop_proxy.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "chrome/browser/sync_file_system/drive_file_sync_service.h" #include "chrome/browser/sync_file_system/sync_file_system.pb.h" diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index 2c88bf5..bf9414f 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 5136fa3..5b8fa92 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" +#include "base/sequenced_task_runner.h" #include "base/string_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index 2da502d..b90cd26 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/shell_integration.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h index 212ef9d..33d8368 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "ui/views/controls/menu/menu_delegate.h" class Browser; diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index d088d61..025c987 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -20,11 +20,11 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "base/prefs/pref_member.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "base/threading/worker_pool.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/quota_internals_proxy.h b/chrome/browser/ui/webui/quota_internals_proxy.h index 8ecb51e..2a36b1a 100644 --- a/chrome/browser/ui/webui/quota_internals_proxy.h +++ b/chrome/browser/ui/webui/quota_internals_proxy.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/public/browser/browser_thread.h" #include "webkit/quota/quota_manager.h" #include "webkit/quota/quota_types.h" diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index b51b738..baad82d 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -9,7 +9,7 @@ #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 0372483..404cfc0 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -17,7 +17,7 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_id.h" #include "chrome/browser/webdata/keyword_table.h" diff --git a/chrome/service/service_process_prefs_unittest.cc b/chrome/service/service_process_prefs_unittest.cc index 4cd7e6f..3d7ae1f 100644 --- a/chrome/service/service_process_prefs_unittest.cc +++ b/chrome/service/service_process_prefs_unittest.cc @@ -6,7 +6,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chrome/service/service_process_prefs.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |