diff options
137 files changed, 147 insertions, 147 deletions
diff --git a/base/base.gypi b/base/base.gypi index b3647d5..be869ce 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -398,6 +398,9 @@ 'sequence_checker.h', 'sequence_checker_impl.cc', 'sequence_checker_impl.h', + 'sequenced_task_runner.cc', + 'sequenced_task_runner.h', + 'sequenced_task_runner_helpers.h', 'sha1.h', 'sha1_portable.cc', 'sha1_win.cc', @@ -462,9 +465,6 @@ 'sys_info_openbsd.cc', 'sys_info_posix.cc', 'sys_info_win.cc', - 'task/sequenced_task_runner.cc', - 'task/sequenced_task_runner.h', - 'task/sequenced_task_runner_helpers.h', 'task_runner.cc', 'task_runner.h', 'task_runner_util.h', diff --git a/base/deferred_sequenced_task_runner.h b/base/deferred_sequenced_task_runner.h index d3a0e5ee..d1cdb43 100644 --- a/base/deferred_sequenced_task_runner.h +++ b/base/deferred_sequenced_task_runner.h @@ -12,8 +12,8 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner.h" #include "base/time.h" #include "base/tracked_objects.h" diff --git a/base/message_loop.h b/base/message_loop.h index 433d311a..f3ad3a5 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -17,10 +17,10 @@ #include "base/message_pump.h" #include "base/observer_list.h" #include "base/pending_task.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner_helpers.h" -#include "base/time.h" #include "base/tracking_info.h" +#include "base/time.h" #if defined(OS_WIN) // We need this to declare base::MessagePumpWin::Dispatcher, which we should diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc index c651f3f..0d3d42e 100644 --- a/base/prefs/json_pref_store.cc +++ b/base/prefs/json_pref_store.cc @@ -13,7 +13,7 @@ #include "base/json/json_string_value_serializer.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" diff --git a/base/sequence_checker_impl.cc b/base/sequence_checker_impl.cc index beb81d99..24d9ed9 100644 --- a/base/sequence_checker_impl.cc +++ b/base/sequence_checker_impl.cc @@ -4,7 +4,7 @@ #include "base/sequence_checker_impl.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" namespace base { diff --git a/base/sequence_checker_impl_unittest.cc b/base/sequence_checker_impl_unittest.cc index dd469ea..4e601b0 100644 --- a/base/sequence_checker_impl_unittest.cc +++ b/base/sequence_checker_impl_unittest.cc @@ -11,7 +11,7 @@ #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/task/sequenced_task_runner.cc b/base/sequenced_task_runner.cc index 1d1da81..00d4048 100644 --- a/base/task/sequenced_task_runner.cc +++ b/base/sequenced_task_runner.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/bind.h" diff --git a/base/task/sequenced_task_runner.h b/base/sequenced_task_runner.h index 1e4973d..f6ca646 100644 --- a/base/task/sequenced_task_runner.h +++ b/base/sequenced_task_runner.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_TASK_SEQUENCED_TASK_RUNNER_H_ -#define BASE_TASK_SEQUENCED_TASK_RUNNER_H_ +#ifndef BASE_SEQUENCED_TASKRUNNER_H_ +#define BASE_SEQUENCED_TASKRUNNER_H_ #include "base/base_export.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/task_runner.h" namespace base { @@ -156,4 +156,4 @@ class BASE_EXPORT SequencedTaskRunner : public TaskRunner { } // namespace base -#endif // BASE_TASK_SEQUENCED_TASK_RUNNER_H_ +#endif // BASE_SEQUENCED_TASKRUNNER_H_ diff --git a/base/task/sequenced_task_runner_helpers.h b/base/sequenced_task_runner_helpers.h index 4a5d2e8..2d0d493 100644 --- a/base/task/sequenced_task_runner_helpers.h +++ b/base/sequenced_task_runner_helpers.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_ -#define BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_ +#ifndef BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_ +#define BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_ #include "base/basictypes.h" @@ -109,4 +109,4 @@ class ReleaseHelperInternal { } // namespace base -#endif // BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_ +#endif // BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_ diff --git a/base/single_thread_task_runner.h b/base/single_thread_task_runner.h index 894bad9..e82941a 100644 --- a/base/single_thread_task_runner.h +++ b/base/single_thread_task_runner.h @@ -6,7 +6,7 @@ #define BASE_SINGLE_THREAD_TASK_RUNNER_H_ #include "base/base_export.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" namespace base { diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h index ab3d2eb..761eefd 100644 --- a/base/test/sequenced_task_runner_test_template.h +++ b/base/test/sequenced_task_runner_test_template.h @@ -17,9 +17,9 @@ #include "base/bind.h" #include "base/callback.h" #include "base/memory/ref_counted.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" 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" diff --git a/chromeos/ime/ibus_daemon_controller.h b/chromeos/ime/ibus_daemon_controller.h index 9f749d1..aa9d91c 100644 --- a/chromeos/ime/ibus_daemon_controller.h +++ b/chromeos/ime/ibus_daemon_controller.h @@ -6,7 +6,7 @@ #define CHROMEOS_IME_IBUS_DAEMON_CONTROLLER_H_ #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "chromeos/chromeos_export.h" namespace chromeos { diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h index d2b083e..e11f3f9 100644 --- a/content/browser/appcache/chrome_appcache_service.h +++ b/content/browser/appcache/chrome_appcache_service.h @@ -7,7 +7,7 @@ #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 "content/common/content_export.h" #include "webkit/appcache/appcache_policy.h" #include "webkit/appcache/appcache_service.h" diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc index 87baa4e..ec4b7cc 100644 --- a/content/browser/browser_thread_unittest.cc +++ b/content/browser/browser_thread_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/browser/browser_thread_impl.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/byte_stream.cc b/content/browser/byte_stream.cc index 747f1ed..f83e8c3 100644 --- a/content/browser/byte_stream.cc +++ b/content/browser/byte_stream.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" namespace content { namespace { diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h index 7458de8..6885068 100644 --- a/content/browser/download/download_manager_impl.h +++ b/content/browser/download/download_manager_impl.h @@ -13,8 +13,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/synchronization/lock.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "content/browser/download/download_item_impl_delegate.h" #include "content/common/content_export.h" #include "content/public/browser/download_manager.h" diff --git a/content/browser/fileapi/chrome_blob_storage_context.h b/content/browser/fileapi/chrome_blob_storage_context.h index e0e4d7a..3992e0e 100644 --- a/content/browser/fileapi/chrome_blob_storage_context.h +++ b/content/browser/fileapi/chrome_blob_storage_context.h @@ -7,7 +7,7 @@ #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 "content/common/content_export.h" namespace webkit_blob { diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h index d82763f..216c83e 100644 --- a/content/browser/host_zoom_map_impl.h +++ b/content/browser/host_zoom_map_impl.h @@ -10,9 +10,9 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/supports_user_data.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/content/browser/loader/resource_handler.h b/content/browser/loader/resource_handler.h index d395d29..de8bd9d 100644 --- a/content/browser/loader/resource_handler.h +++ b/content/browser/loader/resource_handler.h @@ -14,7 +14,7 @@ #include <string> -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" diff --git a/content/browser/media/media_internals_proxy.h b/content/browser/media/media_internals_proxy.h index 7e38d50..5d173b3 100644 --- a/content/browser/media/media_internals_proxy.h +++ b/content/browser/media/media_internals_proxy.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_PROXY_H_ #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/browser/media/media_internals.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc index 802e057..2822e40 100644 --- a/content/browser/net/sqlite_persistent_cookie_store.cc +++ b/content/browser/net/sqlite_persistent_cookie_store.cc @@ -19,10 +19,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/net/sqlite_persistent_cookie_store_perftest.cc b/content/browser/net/sqlite_persistent_cookie_store_perftest.cc index 077ec43..d43a843 100644 --- a/content/browser/net/sqlite_persistent_cookie_store_perftest.cc +++ b/content/browser/net/sqlite_persistent_cookie_store_perftest.cc @@ -8,9 +8,9 @@ #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" #include "base/perftimer.h" +#include "base/sequenced_task_runner.h" #include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner.h" #include "base/test/sequenced_worker_pool_owner.h" #include "base/threading/sequenced_worker_pool.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/net/sqlite_persistent_cookie_store_unittest.cc b/content/browser/net/sqlite_persistent_cookie_store_unittest.cc index ef49c76..cd0e078 100644 --- a/content/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/content/browser/net/sqlite_persistent_cookie_store_unittest.cc @@ -13,9 +13,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner.h" #include "base/test/sequenced_worker_pool_owner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc index 22a9d17..e1efc1f 100644 --- a/content/browser/plugin_data_remover_impl.cc +++ b/content/browser/plugin_data_remover_impl.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "base/utf_string_conversions.h" #include "base/version.h" #include "content/browser/plugin_process_host.h" diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h index 6adefb1..20c0b12 100644 --- a/content/browser/renderer_host/gpu_message_filter.h +++ b/content/browser/renderer_host/gpu_message_filter.h @@ -10,7 +10,7 @@ #include "base/memory/linked_ptr.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 "content/common/gpu/gpu_process_launch_causes.h" #include "content/public/browser/browser_message_filter.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index 9b93cc4..077a1cc 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -32,8 +32,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "content/common/media/audio_messages.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h index feae04c..803539c 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.h +++ b/content/browser/renderer_host/media/audio_renderer_host.h @@ -43,8 +43,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h index 4cffbfa..581ae88 100644 --- a/content/browser/renderer_host/media/video_capture_host.h +++ b/content/browser/renderer_host/media/video_capture_host.h @@ -39,7 +39,7 @@ #include <map> #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/browser/renderer_host/media/video_capture_controller.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc index 5413bd0..04327dd 100644 --- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc +++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc @@ -64,9 +64,9 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner.h" #include "base/stringprintf.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "base/time.h" diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index 9765011..fb45016 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -15,9 +15,9 @@ #include "base/files/file_path.h" #include "base/memory/linked_ptr.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/shared_memory.h" #include "base/string16.h" -#include "base/task/sequenced_task_runner_helpers.h" #include "build/build_config.h" #include "content/common/pepper_renderer_instance_data.h" #include "content/public/browser/browser_message_filter.h" diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index b52fbb2..9bd8275 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" #include "net/ssl/ssl_cert_request_info.h" diff --git a/content/browser/streams/stream_context.h b/content/browser/streams/stream_context.h index 57eb84b..7b8adcbd 100644 --- a/content/browser/streams/stream_context.h +++ b/content/browser/streams/stream_context.h @@ -7,7 +7,7 @@ #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 "content/public/browser/browser_thread.h" namespace content { diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc index c70c21f..2b7297b 100644 --- a/content/browser/utility_process_host_impl.cc +++ b/content/browser/utility_process_host_impl.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/utf_string_conversions.h" #include "content/browser/browser_child_process_host_impl.h" #include "content/common/child_process_host_impl.h" diff --git a/content/browser/webui/url_data_source_impl.h b/content/browser/webui/url_data_source_impl.h index 828bbf9..4785b37 100644 --- a/content/browser/webui/url_data_source_impl.h +++ b/content/browser/webui/url_data_source_impl.h @@ -7,7 +7,7 @@ #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 "content/browser/webui/url_data_manager.h" #include "content/common/content_export.h" diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index aaeb1ac..e34f080 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h @@ -34,7 +34,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "content/public/browser/download_id.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 44a052f..be6b995 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/process_util.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #if defined(OS_WIN) #include "base/shared_memory.h" #endif diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h index 0429980..1a05791 100644 --- a/content/renderer/webplugin_delegate_proxy.h +++ b/content/renderer/webplugin_delegate_proxy.h @@ -11,7 +11,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 "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 7146bdf..00d6737 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -4,8 +4,8 @@ #include "device/bluetooth/bluetooth_adapter_mac.h" -#import <IOBluetooth/objc/IOBluetoothDevice.h> #import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h> +#import <IOBluetooth/objc/IOBluetoothDevice.h> #import <IOBluetooth/objc/IOBluetoothHostController.h> #include <string> @@ -15,11 +15,11 @@ #include "base/hash_tables.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/strings/sys_string_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/time.h" +#include "base/strings/sys_string_conversions.h" #include "device/bluetooth/bluetooth_device_mac.h" // Replicate specific 10.7 SDK declarations for building with prior SDKs. diff --git a/device/bluetooth/bluetooth_adapter_win.cc b/device/bluetooth/bluetooth_adapter_win.cc index 3dbdee0..f6ca1d6 100644 --- a/device/bluetooth/bluetooth_adapter_win.cc +++ b/device/bluetooth/bluetooth_adapter_win.cc @@ -9,9 +9,9 @@ #include <utility> #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "device/bluetooth/bluetooth_device_win.h" #include "device/bluetooth/bluetooth_task_manager_win.h" diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc index ad9046f..2fca071 100644 --- a/device/bluetooth/bluetooth_task_manager_win.cc +++ b/device/bluetooth/bluetooth_task_manager_win.cc @@ -13,9 +13,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" +#include "base/sequenced_task_runner.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/win/scoped_handle.h" #include "device/bluetooth/bluetooth_init_win.h" diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc index c25a3d5..869e924 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc +++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc @@ -14,8 +14,8 @@ #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/thread_checker.h" #include "dbus/bus.h" #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h" diff --git a/media/video/capture/screen/screen_capture_device.cc b/media/video/capture/screen/screen_capture_device.cc index 4bb5cc9..a4f55bd 100644 --- a/media/video/capture/screen/screen_capture_device.cc +++ b/media/video/capture/screen/screen_capture_device.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner.h" #include "media/video/capture/screen/mouse_cursor_shape.h" #include "media/video/capture/screen/screen_capture_data.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/media/video/capture/screen/screen_capture_device_unittest.cc b/media/video/capture/screen/screen_capture_device_unittest.cc index b147fc0..6b74465 100644 --- a/media/video/capture/screen/screen_capture_device_unittest.cc +++ b/media/video/capture/screen/screen_capture_device_unittest.cc @@ -5,8 +5,8 @@ #include "media/video/capture/screen/screen_capture_device.h" #include "base/basictypes.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index 6237991..adaec8b 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -15,9 +15,9 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "base/strings/string_tokenizer.h" -#include "base/task/sequenced_task_runner.h" #include "googleurl/src/url_parse.h" #include "jni/ProxyChangeListener_jni.h" #include "net/base/host_port_pair.h" diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h index 3bcd501..4c8e4af 100644 --- a/net/url_request/url_request_context_getter.h +++ b/net/url_request/url_request_context_getter.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_NET_URL_REQUEST_CONTEXT_GETTER_H_ #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "net/base/net_export.h" namespace base { diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index afcd37a..add2a0a 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -9,7 +9,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 "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" diff --git a/remoting/host/desktop_session_proxy.h b/remoting/host/desktop_session_proxy.h index 060d132..34eac55 100644 --- a/remoting/host/desktop_session_proxy.h +++ b/remoting/host/desktop_session_proxy.h @@ -12,7 +12,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 "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" #include "media/video/capture/screen/screen_capturer.h" diff --git a/remoting/host/setup/native_messaging_reader.cc b/remoting/host/setup/native_messaging_reader.cc index b182461..e98ac52 100644 --- a/remoting/host/setup/native_messaging_reader.cc +++ b/remoting/host/setup/native_messaging_reader.cc @@ -9,9 +9,9 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/location.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc index 02086c0..47e32d1 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc @@ -9,8 +9,8 @@ #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/string_number_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "rlz/lib/lib_values.h" #include "rlz/lib/recursive_cross_process_lock_posix.h" diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc index df34d82..674c5be 100644 --- a/sync/internal_api/test/fake_sync_manager.cc +++ b/sync/internal_api/test/fake_sync_manager.cc @@ -11,8 +11,8 @@ #include "base/location.h" #include "base/logging.h" #include "base/run_loop.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "sync/internal_api/public/http_post_provider_factory.h" #include "sync/internal_api/public/internal_components_factory.h" diff --git a/webkit/blob/blob_data_handle.cc b/webkit/blob/blob_data_handle.cc index b524330..e61c88b 100644 --- a/webkit/blob/blob_data_handle.cc +++ b/webkit/blob/blob_data_handle.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "webkit/blob/blob_data.h" #include "webkit/blob/blob_storage_context.h" diff --git a/webkit/blob/blob_storage_host.cc b/webkit/blob/blob_storage_host.cc index 1a707c1..8397fa5 100644 --- a/webkit/blob/blob_storage_host.cc +++ b/webkit/blob/blob_storage_host.cc @@ -4,7 +4,7 @@ #include "webkit/blob/blob_storage_host.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "googleurl/src/gurl.h" #include "webkit/blob/blob_data_handle.h" #include "webkit/blob/blob_storage_context.h" diff --git a/webkit/dom_storage/dom_storage_task_runner.h b/webkit/dom_storage/dom_storage_task_runner.h index ff34dfd..fd2efe9 100644 --- a/webkit/dom_storage/dom_storage_task_runner.h +++ b/webkit/dom_storage/dom_storage_task_runner.h @@ -6,7 +6,7 @@ #define WEBKIT_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_ #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/async_file_util_adapter.cc b/webkit/fileapi/async_file_util_adapter.cc index f8fc931..62fb835 100644 --- a/webkit/fileapi/async_file_util_adapter.cc +++ b/webkit/fileapi/async_file_util_adapter.cc @@ -5,7 +5,7 @@ #include "webkit/fileapi/async_file_util_adapter.h" #include "base/bind.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "webkit/blob/shareable_file_reference.h" #include "webkit/fileapi/file_system_context.h" diff --git a/webkit/fileapi/file_system_context.h b/webkit/fileapi/file_system_context.h index c22ab61..edc6ec5 100644 --- a/webkit/fileapi/file_system_context.h +++ b/webkit/fileapi/file_system_context.h @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/platform_file.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/task_runner_bound_observer_list.h" diff --git a/webkit/fileapi/file_system_operation_context.cc b/webkit/fileapi/file_system_operation_context.cc index f2178a6..ae20606f 100644 --- a/webkit/fileapi/file_system_operation_context.cc +++ b/webkit/fileapi/file_system_operation_context.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/file_system_operation_context.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_task_runners.h" diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/fileapi/file_system_quota_client.cc index d868673..8f38b17 100644 --- a/webkit/fileapi/file_system_quota_client.cc +++ b/webkit/fileapi/file_system_quota_client.cc @@ -13,8 +13,8 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/task/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/webkit/fileapi/file_system_task_runners.cc b/webkit/fileapi/file_system_task_runners.cc index 564a455..c24562a 100644 --- a/webkit/fileapi/file_system_task_runners.cc +++ b/webkit/fileapi/file_system_task_runners.cc @@ -5,8 +5,8 @@ #include "webkit/fileapi/file_system_task_runners.h" #include "base/message_loop_proxy.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/task/sequenced_task_runner.h" namespace fileapi { diff --git a/webkit/fileapi/file_system_usage_cache.h b/webkit/fileapi/file_system_usage_cache.h index 080cbba..3058f1b 100644 --- a/webkit/fileapi/file_system_usage_cache.h +++ b/webkit/fileapi/file_system_usage_cache.h @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/timer.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/fileapi/file_writer_delegate.cc b/webkit/fileapi/file_writer_delegate.cc index eea6aee..4eb902c 100644 --- a/webkit/fileapi/file_writer_delegate.cc +++ b/webkit/fileapi/file_writer_delegate.cc @@ -9,7 +9,7 @@ #include "base/files/file_util_proxy.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" #include "webkit/fileapi/file_stream_writer.h" diff --git a/webkit/fileapi/isolated_mount_point_provider.cc b/webkit/fileapi/isolated_mount_point_provider.cc index 46a5008..b8094e4 100644 --- a/webkit/fileapi/isolated_mount_point_provider.cc +++ b/webkit/fileapi/isolated_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 "webkit/blob/local_file_stream_reader.h" #include "webkit/fileapi/async_file_util_adapter.h" #include "webkit/fileapi/copy_or_move_file_validator.h" diff --git a/webkit/fileapi/sandbox_file_stream_writer.cc b/webkit/fileapi/sandbox_file_stream_writer.cc index e59496c..8134753 100644 --- a/webkit/fileapi/sandbox_file_stream_writer.cc +++ b/webkit/fileapi/sandbox_file_stream_writer.cc @@ -6,7 +6,7 @@ #include "base/files/file_util_proxy.h" #include "base/platform_file.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "webkit/blob/local_file_stream_reader.h" diff --git a/webkit/fileapi/sandbox_quota_observer.cc b/webkit/fileapi/sandbox_quota_observer.cc index 2117a5c..0e49710 100644 --- a/webkit/fileapi/sandbox_quota_observer.cc +++ b/webkit/fileapi/sandbox_quota_observer.cc @@ -4,7 +4,7 @@ #include "webkit/fileapi/sandbox_quota_observer.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_usage_cache.h" #include "webkit/fileapi/file_system_util.h" diff --git a/webkit/fileapi/syncable/local_file_change_tracker.cc b/webkit/fileapi/syncable/local_file_change_tracker.cc index efc5ba7..59672e4 100644 --- a/webkit/fileapi/syncable/local_file_change_tracker.cc +++ b/webkit/fileapi/syncable/local_file_change_tracker.cc @@ -8,8 +8,8 @@ #include "base/location.h" #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_file_util.h" diff --git a/webkit/fileapi/task_runner_bound_observer_list.h b/webkit/fileapi/task_runner_bound_observer_list.h index ce9aea6..9c9aff2 100644 --- a/webkit/fileapi/task_runner_bound_observer_list.h +++ b/webkit/fileapi/task_runner_bound_observer_list.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/memory/ref_counted.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "base/threading/thread.h" namespace fileapi { diff --git a/webkit/fileapi/test_mount_point_provider.cc b/webkit/fileapi/test_mount_point_provider.cc index 33a2832..5c9b011 100644 --- a/webkit/fileapi/test_mount_point_provider.cc +++ b/webkit/fileapi/test_mount_point_provider.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/file_util.h" -#include "base/task/sequenced_task_runner.h" +#include "base/sequenced_task_runner.h" #include "webkit/fileapi/copy_or_move_file_validator.h" #include "webkit/fileapi/file_observers.h" #include "webkit/fileapi/file_system_file_stream_reader.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index a6e517a..7afc9de 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -11,7 +11,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/timer.h" #include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h index 4fa53d0..0ea0080 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h @@ -10,7 +10,7 @@ #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 "ppapi/c/pp_var.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" #include "ui/gfx/rect.h" diff --git a/webkit/plugins/webview_plugin.h b/webkit/plugins/webview_plugin.h index 60d77b5..503d410 100644 --- a/webkit/plugins/webview_plugin.h +++ b/webkit/plugins/webview_plugin.h @@ -8,7 +8,7 @@ #include <list> #include "base/memory/scoped_ptr.h" -#include "base/task/sequenced_task_runner_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc index 3ee48c9..761954a 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -16,10 +16,10 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/metrics/histogram.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/sys_info.h" -#include "base/task/sequenced_task_runner.h" #include "base/task_runner_util.h" #include "base/time.h" #include "net/base/net_util.h" diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h index 7fb0d78..af6f69d 100644 --- a/webkit/quota/quota_manager.h +++ b/webkit/quota/quota_manager.h @@ -19,7 +19,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 "webkit/quota/quota_client.h" #include "webkit/quota/quota_database.h" #include "webkit/quota/quota_task.h" diff --git a/webkit/quota/quota_task.h b/webkit/quota/quota_task.h index a2dea4d..1102dac 100644 --- a/webkit/quota/quota_task.h +++ b/webkit/quota/quota_task.h @@ -10,7 +10,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 "webkit/storage/webkit_storage_export.h" namespace base { |