From 34b9963c187a733bef76535521f3de688fffd34f Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Sat, 1 Jan 2011 01:01:06 +0000 Subject: [PATCH] Move base/thread.h to base/threading, fix up callers to use the new location. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98 --- app/x11_util.cc | 2 +- base/base.gyp | 4 ++-- base/base.gypi | 12 +++++------ base/cancellation_flag_unittest.cc | 2 +- base/condition_variable_unittest.cc | 2 +- base/file_util_posix.cc | 2 +- base/file_util_win.cc | 2 +- base/file_version_info_win.cc | 2 +- base/lazy_instance.h | 2 +- base/message_loop_proxy_impl.cc | 2 +- base/message_loop_proxy_impl_unittest.cc | 2 +- base/message_loop_unittest.cc | 2 +- base/message_pump_glib_unittest.cc | 2 +- base/native_library_linux.cc | 2 +- base/native_library_win.cc | 2 +- base/nss_util.cc | 2 +- base/platform_file_win.cc | 2 +- base/process_util_linux.cc | 2 +- base/process_util_posix.cc | 2 +- base/ref_counted.cc | 4 ++-- base/ref_counted.h | 2 +- base/shared_memory_posix.cc | 2 +- base/singleton.h | 2 +- base/sys_info_chromeos.cc | 2 +- base/threading/platform_thread_posix.cc | 2 +- base/threading/platform_thread_win.cc | 2 +- base/{ => threading}/thread.cc | 2 +- base/{ => threading}/thread.h | 0 .../thread_collision_warner.cc | 4 ++-- .../{ => threading}/thread_collision_warner.h | 8 ++++---- .../thread_collision_warner_unittest.cc | 2 +- base/{ => threading}/thread_restrictions.cc | 2 +- base/{ => threading}/thread_restrictions.h | 6 +++--- base/{ => threading}/thread_unittest.cc | 2 +- base/tools_sanity_unittest.cc | 2 +- base/tracked_objects.cc | 2 +- base/weak_ptr_unittest.cc | 2 +- base/win/registry.cc | 2 +- base/win/win_util.cc | 2 +- ceee/ie/broker/chrome_postman.h | 2 +- ceee/ie/plugin/bho/executor_com_unittest.cc | 2 +- .../browser/automation/automation_provider.cc | 2 +- .../automation_provider_observers.cc | 2 +- .../automation/testing_automation_provider.cc | 2 +- chrome/browser/browser_about_handler.cc | 2 +- chrome/browser/browser_main.cc | 2 +- chrome/browser/browser_process_impl.cc | 4 ++-- chrome/browser/browser_shutdown.cc | 4 ++-- chrome/browser/browser_thread.cc | 2 +- chrome/browser/browser_thread.h | 2 +- chrome/browser/child_process_launcher.cc | 2 +- chrome/browser/chromeos/boot_times_loader.cc | 4 ++-- .../browser/chromeos/dom_ui/system_info_ui.cc | 2 +- .../chromeos/google_update_chromeos.cc | 2 +- chrome/browser/chromeos/login/camera.cc | 2 +- chrome/browser/chromeos/login/camera.h | 2 +- .../chromeos/login/user_image_screen.h | 2 +- chrome/browser/chromeos/pulse_audio_mixer.h | 2 +- chrome/browser/chromeos/version_loader.cc | 2 +- chrome/browser/crash_handler_host_linux.cc | 2 +- .../devtools_http_protocol_handler.cc | 2 +- .../devtools_remote_listen_socket_unittest.h | 4 ++-- .../device_orientation/provider_impl.cc | 2 +- .../browser/dom_ui/chrome_url_data_manager.cc | 2 +- .../dom_ui/dom_ui_screenshot_source.cc | 2 +- .../browser/dom_ui/downloads_dom_handler.cc | 2 +- chrome/browser/dom_ui/downloads_ui.cc | 2 +- chrome/browser/dom_ui/filebrowse_ui.cc | 2 +- chrome/browser/dom_ui/history2_ui.cc | 2 +- chrome/browser/dom_ui/history_ui.cc | 2 +- chrome/browser/dom_ui/mediaplayer_ui.cc | 2 +- chrome/browser/dom_ui/most_visited_handler.cc | 2 +- chrome/browser/dom_ui/new_tab_ui.cc | 2 +- .../options/advanced_options_utils_win.cc | 2 +- .../dom_ui/options/import_data_handler.cc | 2 +- chrome/browser/dom_ui/options/options_ui.cc | 2 +- .../dom_ui/shared_resources_data_source.cc | 2 +- chrome/browser/dom_ui/slideshow_ui.cc | 2 +- chrome/browser/download/download_util.cc | 2 +- chrome/browser/download/save_file_manager.cc | 2 +- chrome/browser/download/save_package.cc | 2 +- .../extensions/autoupdate_interceptor.cc | 2 +- chrome/browser/extensions/crx_installer.cc | 2 +- .../browser/extensions/extension_protocols.cc | 2 +- .../extensions/extension_rlz_module.cc | 2 +- .../browser/extensions/extension_service.cc | 2 +- .../browser/extensions/extension_updater.cc | 2 +- .../extensions/extension_updater_unittest.cc | 2 +- chrome/browser/extensions/extensions_ui.cc | 2 +- .../user_script_listener_unittest.cc | 2 +- .../browser/extensions/user_script_master.cc | 2 +- chrome/browser/external_protocol_handler.cc | 2 +- .../file_path_watcher_inotify.cc | 2 +- .../file_system_dispatcher_host.cc | 2 +- .../gateway_data_provider_common.h | 2 +- .../geolocation/geolocation_provider.cc | 2 +- .../geolocation/geolocation_provider.h | 2 +- .../geolocation/mock_location_provider.h | 2 +- .../geolocation/network_location_provider.h | 2 +- .../geolocation/wifi_data_provider_common.h | 2 +- chrome/browser/google/google_update.cc | 2 +- chrome/browser/gpu_process_host.cc | 2 +- chrome/browser/gtk/dialogs_gtk.cc | 4 ++-- .../gtk/options/advanced_contents_gtk.cc | 2 +- chrome/browser/icon_loader_linux.cc | 2 +- chrome/browser/icon_loader_mac.mm | 2 +- chrome/browser/icon_loader_win.cc | 2 +- chrome/browser/importer/importer.cc | 2 +- chrome/browser/importer/profile_writer.cc | 2 +- .../browser/in_process_webkit/webkit_thread.h | 2 +- chrome/browser/io_thread.cc | 2 +- chrome/browser/jankometer.cc | 2 +- chrome/browser/jumplist_win.cc | 2 +- chrome/browser/memory_details_mac.cc | 2 +- chrome/browser/memory_purger.cc | 2 +- .../browser/metrics/histogram_synchronizer.cc | 2 +- chrome/browser/metrics/metrics_service.cc | 2 +- chrome/browser/net/connection_tester.cc | 2 +- chrome/browser/net/predictor_api.cc | 2 +- .../net/sqlite_persistent_cookie_store.cc | 2 +- .../net/ssl_config_service_manager_pref.cc | 2 +- .../browser/net/url_request_mock_http_job.cc | 2 +- chrome/browser/net/url_request_mock_util.cc | 2 +- .../desktop_notification_service.cc | 2 +- chrome/browser/oom_priority_manager.cc | 2 +- .../browser/password_manager/password_store.h | 2 +- .../password_manager/password_store_mac.h | 2 +- chrome/browser/plugin_service.cc | 2 +- .../printing/print_dialog_cloud_uitest.cc | 2 +- chrome/browser/printing/print_dialog_gtk.cc | 2 +- chrome/browser/printing/print_job.cc | 2 +- chrome/browser/printing/print_job_worker.h | 2 +- chrome/browser/printing/printer_query.cc | 2 +- chrome/browser/process_info_snapshot_mac.cc | 2 +- .../browser/process_singleton_linux_uitest.cc | 2 +- chrome/browser/process_singleton_uitest.cc | 2 +- .../browser_render_process_host.cc | 4 ++-- .../renderer_host/database_message_filter.cc | 2 +- .../renderer_host/render_message_filter.cc | 2 +- .../renderer_host/render_widget_helper.cc | 2 +- .../render_widget_host_view_win.cc | 2 +- chrome/browser/rlz/rlz.cc | 4 ++-- .../search_engines/search_terms_data.cc | 2 +- .../template_url_model_test_util.cc | 2 +- .../template_url_model_unittest.cc | 2 +- .../service/service_process_control.cc | 4 ++-- .../browser/sessions/base_session_service.cc | 2 +- chrome/browser/sessions/session_service.cc | 2 +- chrome/browser/shell_integration_linux.cc | 2 +- chrome/browser/spellcheck_host.cc | 2 +- chrome/browser/sync/engine/syncer_thread.h | 2 +- .../glue/database_model_worker_unittest.cc | 2 +- .../browser/sync/glue/http_bridge_unittest.cc | 2 +- chrome/browser/sync/glue/sync_backend_host.h | 2 +- .../sync/glue/ui_model_worker_unittest.cc | 2 +- ...profile_sync_service_typed_url_unittest.cc | 2 +- chrome/browser/sync/profile_sync_test_util.h | 2 +- .../browser/tab_contents/interstitial_page.cc | 2 +- chrome/browser/task_manager/task_manager.cc | 2 +- .../task_manager_resource_providers.cc | 2 +- chrome/browser/themes/browser_theme_pack.cc | 2 +- chrome/browser/ui/browser.cc | 4 ++-- chrome/browser/ui/browser_init.cc | 2 +- chrome/browser/ui/cocoa/shell_dialogs_mac.mm | 2 +- chrome/browser/ui/cocoa/web_drag_source.mm | 2 +- chrome/browser/ui/options/options_util.cc | 2 +- chrome/browser/ui/views/about_ipc_dialog.cc | 2 +- .../ui/views/external_protocol_dialog.cc | 4 ++-- .../views/options/advanced_contents_view.cc | 2 +- chrome/browser/ui/views/shell_dialogs_win.cc | 2 +- .../tab_contents/tab_contents_drag_win.cc | 2 +- .../browser/visitedlink/visitedlink_master.cc | 2 +- chrome/browser/web_applications/web_app.cc | 2 +- chrome/browser/webdata/web_data_service.cc | 2 +- chrome/browser/worker_host/worker_service.cc | 2 +- chrome/common/child_process.cc | 2 +- chrome/common/child_process.h | 2 +- chrome/common/chrome_plugin_lib.cc | 2 +- chrome/common/chrome_version_info.cc | 2 +- .../common/extensions/extension_resource.cc | 2 +- .../common/extensions/extension_unpacker.cc | 2 +- chrome/common/important_file_writer.cc | 2 +- .../common/important_file_writer_unittest.cc | 2 +- chrome/common/json_pref_store_unittest.cc | 2 +- chrome/common/net/url_fetcher.cc | 2 +- chrome/common/net/url_fetcher_unittest.cc | 2 +- chrome/common/worker_thread_ticker.cc | 2 +- chrome/common/worker_thread_ticker.h | 2 +- .../plugin_install_job_monitor.h | 2 +- chrome/gpu/gpu_watchdog_thread.h | 2 +- .../installer/util/google_update_settings.cc | 2 +- chrome/profile_import/profile_import_thread.h | 2 +- .../renderer/safe_browsing/scorer_unittest.cc | 2 +- .../cloud_print/cloud_print_proxy_backend.h | 2 +- .../cloud_print_url_fetcher_unittest.cc | 2 +- .../service/cloud_print/job_status_updater.h | 2 +- .../service/cloud_print/printer_job_handler.h | 2 +- chrome/service/service_process.h | 2 +- chrome/test/automation/automation_proxy.h | 2 +- chrome/test/automation/window_proxy.h | 2 +- .../interactive_ui/view_event_test_base.h | 2 +- chrome/worker/nativewebworker_impl.cc | 2 +- chrome_frame/cfproxy_private.h | 2 +- chrome_frame/chrome_active_document.cc | 2 +- chrome_frame/chrome_active_document.h | 2 +- chrome_frame/chrome_frame_automation.h | 2 +- .../crash_reporting/nt_loader_unittest.cc | 20 ++++++++++--------- chrome_frame/external_tab_test.cc | 2 +- chrome_frame/metrics_service.cc | 2 +- .../test/urlmon_moniker_integration_test.cc | 2 +- chrome_frame/urlmon_url_request.h | 2 +- chrome_frame/utils.h | 2 +- chrome_frame/vtable_patch_manager_unittest.cc | 2 +- .../command_buffer_service_unittest.cc | 2 +- ipc/ipc_channel_proxy.cc | 2 +- ipc/ipc_logging.cc | 2 +- ipc/ipc_sync_channel_unittest.cc | 2 +- ipc/ipc_tests.cc | 2 +- .../notifier/listener/mediator_thread_impl.h | 2 +- media/audio/audio_input_controller.cc | 2 +- media/audio/audio_input_controller.h | 2 +- media/audio/audio_manager_base.h | 2 +- media/audio/fake_audio_input_stream.h | 2 +- media/audio/linux/audio_manager_linux.h | 2 +- media/base/pipeline_impl.h | 2 +- media/filters/decoder_base.h | 2 +- media/filters/ffmpeg_demuxer_unittest.cc | 2 +- media/tools/player_wtl/movie.h | 2 +- media/tools/player_x11/player_x11.cc | 2 +- net/base/directory_lister.cc | 2 +- net/base/keygen_handler_unittest.cc | 2 +- net/base/listen_socket_unittest.h | 2 +- net/base/network_change_notifier_linux.cc | 5 +++-- net/base/network_config_watcher_mac.cc | 2 +- net/base/ssl_config_service_win.cc | 2 +- net/disk_cache/backend_impl.cc | 2 +- net/disk_cache/disk_cache_perftest.cc | 2 +- net/disk_cache/disk_cache_test_base.h | 2 +- net/disk_cache/stress_cache.cc | 2 +- net/http/http_auth_gssapi_posix.cc | 2 +- net/proxy/multi_threaded_proxy_resolver.cc | 2 +- .../proxy_config_service_linux_unittest.cc | 2 +- net/proxy/proxy_config_service_win.cc | 2 +- .../sync_host_resolver_bridge_unittest.cc | 2 +- net/socket/nss_ssl_util.cc | 2 +- net/socket/ssl_client_socket_nss.cc | 2 +- net/test/test_server_win.cc | 2 +- net/tools/crash_cache/crash_cache.cc | 2 +- net/tools/dump_cache/upgrade.cc | 2 +- net/tools/hresolv/hresolv.cc | 2 +- net/url_request/url_request_file_job.cc | 2 +- net/url_request/url_request_unittest.h | 2 +- .../main_thread_archive_callback_client.h | 2 +- o3d/import/cross/threaded_stream_processor.h | 2 +- remoting/base/tracer.cc | 2 +- remoting/client/client_context.cc | 2 +- remoting/client/client_context.h | 2 +- remoting/client/plugin/chromoting_instance.cc | 2 +- remoting/host/chromoting_host.h | 2 +- remoting/host/chromoting_host_context.cc | 2 +- remoting/host/chromoting_host_context.h | 2 +- remoting/host/simple_host_process.cc | 2 +- .../appcache_request_handler_unittest.cc | 2 +- webkit/appcache/appcache_response_unittest.cc | 2 +- .../appcache_storage_impl_unittest.cc | 2 +- .../appcache/appcache_update_job_unittest.cc | 2 +- .../appcache_url_request_job_unittest.cc | 2 +- webkit/blob/blob_url_request_job_unittest.cc | 2 +- webkit/glue/webmediaplayer_impl.h | 2 +- .../test/plugin_thread_async_call_test.cc | 2 +- .../tools/test_shell/simple_appcache_system.h | 2 +- .../simple_resource_loader_bridge.cc | 2 +- .../test_shell/test_shell_request_context.h | 10 +++++----- 273 files changed, 311 insertions(+), 308 deletions(-) rename base/{ => threading}/thread.cc (99%) rename base/{ => threading}/thread.h (100%) rename base/{ => threading}/thread_collision_warner.cc (94%) rename base/{ => threading}/thread_collision_warner.h (97%) rename base/{ => threading}/thread_collision_warner_unittest.cc (99%) rename base/{ => threading}/thread_restrictions.cc (97%) rename base/{ => threading}/thread_restrictions.h (96%) rename base/{ => threading}/thread_unittest.cc (99%) diff --git a/app/x11_util.cc b/app/x11_util.cc index 039447563fc4..549cca861003 100644 --- a/app/x11_util.cc +++ b/app/x11_util.cc @@ -22,7 +22,7 @@ #include "base/logging.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "app/x11_util_internal.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/base/base.gyp b/base/base.gyp index cc98aa49be1a..b1e61e2c8249 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -142,13 +142,13 @@ 'threading/platform_thread_unittest.cc', 'threading/simple_thread_unittest.cc', 'threading/thread_checker_unittest.cc', + 'threading/thread_collision_warner_unittest.cc', 'threading/thread_local_storage_unittest.cc', 'threading/thread_local_unittest.cc', + 'threading/thread_unittest.cc', 'threading/watchdog_unittest.cc', 'threading/worker_pool_posix_unittest.cc', 'threading/worker_pool_unittest.cc', - 'thread_collision_warner_unittest.cc', - 'thread_unittest.cc', 'time_unittest.cc', 'time_win_unittest.cc', 'timer_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index d07cd4342092..451803a9b5e7 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -245,26 +245,26 @@ 'threading/platform_thread_win.cc', 'threading/simple_thread.cc', 'threading/simple_thread.h', + 'threading/thread.cc', + 'threading/thread.h', 'threading/thread_checker.cc', 'threading/thread_checker.h', + 'threading/thread_collision_warner.cc', + 'threading/thread_collision_warner.h', 'threading/thread_local.h', 'threading/thread_local_posix.cc', 'threading/thread_local_storage.h', 'threading/thread_local_storage_posix.cc', 'threading/thread_local_storage_win.cc', 'threading/thread_local_win.cc', + 'threading/thread_restrictions.h', + 'threading/thread_restrictions.cc', 'threading/watchdog.cc', 'threading/watchdog.h', 'threading/worker_pool.h', 'threading/worker_pool_posix.cc', 'threading/worker_pool_posix.h', 'threading/worker_pool_win.cc', - 'thread.cc', - 'thread.h', - 'thread_collision_warner.cc', - 'thread_collision_warner.h', - 'thread_restrictions.h', - 'thread_restrictions.cc', 'time.cc', 'time.h', 'time_win.cc', diff --git a/base/cancellation_flag_unittest.cc b/base/cancellation_flag_unittest.cc index eb28b53ebea5..9c9ffd7859a8 100644 --- a/base/cancellation_flag_unittest.cc +++ b/base/cancellation_flag_unittest.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/spin_wait.h" #include "base/time.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc index ab83fbf1852b..18c9f2d194b3 100644 --- a/base/condition_variable_unittest.cc +++ b/base/condition_variable_unittest.cc @@ -14,7 +14,7 @@ #include "base/scoped_ptr.h" #include "base/spin_wait.h" #include "base/threading/platform_thread.h" -#include "base/thread_collision_warner.h" +#include "base/threading/thread_collision_warner.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 92527c88c0a8..cbfcfb0bdd45 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -38,7 +38,7 @@ #include "base/singleton.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/base/file_util_win.cc b/base/file_util_win.cc index c302d771c79d..9ab96c09a5f7 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -19,7 +19,7 @@ #include "base/win/scoped_handle.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" diff --git a/base/file_version_info_win.cc b/base/file_version_info_win.cc index e2bc84bb38c1..953caa9f1ebd 100644 --- a/base/file_version_info_win.cc +++ b/base/file_version_info_win.cc @@ -10,7 +10,7 @@ #include "base/file_version_info.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" // This has to be last. #include diff --git a/base/lazy_instance.h b/base/lazy_instance.h index bdf5ce3fe669..f4cfda05ffb2 100644 --- a/base/lazy_instance.h +++ b/base/lazy_instance.h @@ -41,7 +41,7 @@ #include "base/atomicops.h" #include "base/basictypes.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" namespace base { diff --git a/base/message_loop_proxy_impl.cc b/base/message_loop_proxy_impl.cc index c0619aa52c2c..3b01fd62f804 100644 --- a/base/message_loop_proxy_impl.cc +++ b/base/message_loop_proxy_impl.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop_proxy_impl.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" namespace base { diff --git a/base/message_loop_proxy_impl_unittest.cc b/base/message_loop_proxy_impl_unittest.cc index 8d8ef4e23429..61c78504badd 100644 --- a/base/message_loop_proxy_impl_unittest.cc +++ b/base/message_loop_proxy_impl_unittest.cc @@ -5,7 +5,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy_impl.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc index 22177370ae5a..e926c5782fd7 100644 --- a/base/message_loop_unittest.cc +++ b/base/message_loop_unittest.cc @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/task.h" #include "base/threading/platform_thread.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc index 73160706c93f..9c9f288bd420 100644 --- a/base/message_pump_glib_unittest.cc +++ b/base/message_pump_glib_unittest.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/base/native_library_linux.cc b/base/native_library_linux.cc index d5ab12865eb1..e282bce2213f 100644 --- a/base/native_library_linux.cc +++ b/base/native_library_linux.cc @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" namespace base { diff --git a/base/native_library_win.cc b/base/native_library_win.cc index b8a806b4a787..b77fbe13cdc6 100644 --- a/base/native_library_win.cc +++ b/base/native_library_win.cc @@ -7,7 +7,7 @@ #include #include "base/file_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" namespace base { diff --git a/base/nss_util.cc b/base/nss_util.cc index 36394dad91ea..b411422bf142 100644 --- a/base/nss_util.cc +++ b/base/nss_util.cc @@ -22,7 +22,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" // USE_NSS means we use NSS for everything crypto-related. If USE_NSS is not // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't diff --git a/base/platform_file_win.cc b/base/platform_file_win.cc index 13983977de48..f9eb23473db4 100644 --- a/base/platform_file_win.cc +++ b/base/platform_file_win.cc @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" namespace base { diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 670de6ab4b61..dcaeeb4b013c 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -22,7 +22,7 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/sys_info.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" namespace { diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 0116d8fa9874..c5cc8c35b50b 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -26,7 +26,7 @@ #include "base/scoped_ptr.h" #include "base/stringprintf.h" #include "base/threading/platform_thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/waitable_event.h" diff --git a/base/ref_counted.cc b/base/ref_counted.cc index f1dffa40c385..2f795ea14df9 100644 --- a/base/ref_counted.cc +++ b/base/ref_counted.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/ref_counted.h" #include "base/logging.h" -#include "base/thread_collision_warner.h" +#include "base/threading/thread_collision_warner.h" namespace base { diff --git a/base/ref_counted.h b/base/ref_counted.h index 9c84efa58040..4c3aeb89dcd0 100644 --- a/base/ref_counted.h +++ b/base/ref_counted.h @@ -7,7 +7,7 @@ #pragma once #include "base/atomic_ref_count.h" -#include "base/thread_collision_warner.h" +#include "base/threading/thread_collision_warner.h" namespace base { diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc index f86b46c0a2e2..a44581e4849f 100644 --- a/base/shared_memory_posix.cc +++ b/base/shared_memory_posix.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/threading/platform_thread.h" #include "base/safe_strerror_posix.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" namespace base { diff --git a/base/singleton.h b/base/singleton.h index a644156a3edd..5bd5c35333b2 100644 --- a/base/singleton.h +++ b/base/singleton.h @@ -10,7 +10,7 @@ #include "base/atomicops.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" // Default traits for Singleton. Calls operator new and operator delete on // the object. Registers automatic deletion at process exit. diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc index e554d73d64e2..583438932de7 100644 --- a/base/sys_info_chromeos.cc +++ b/base/sys_info_chromeos.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" namespace base { diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc index 0ef4990433a3..8452909ed443 100644 --- a/base/threading/platform_thread_posix.cc +++ b/base/threading/platform_thread_posix.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/safe_strerror_posix.h" #include "base/scoped_ptr.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #if defined(OS_MACOSX) #include diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc index 10f3011e2131..734f404cfaf4 100644 --- a/base/threading/platform_thread_win.cc +++ b/base/threading/platform_thread_win.cc @@ -5,7 +5,7 @@ #include "base/threading/platform_thread.h" #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/win/windows_version.h" namespace base { diff --git a/base/thread.cc b/base/threading/thread.cc similarity index 99% rename from base/thread.cc rename to base/threading/thread.cc index 3b170efc42ac..5772d32bc1d5 100644 --- a/base/thread.cc +++ b/base/threading/thread.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/thread.h" +#include "base/threading/thread.h" #include "base/lazy_instance.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" diff --git a/base/thread.h b/base/threading/thread.h similarity index 100% rename from base/thread.h rename to base/threading/thread.h diff --git a/base/thread_collision_warner.cc b/base/threading/thread_collision_warner.cc similarity index 94% rename from base/thread_collision_warner.cc rename to base/threading/thread_collision_warner.cc index be68bc5f47a6..547e11ca66f9 100644 --- a/base/thread_collision_warner.cc +++ b/base/threading/thread_collision_warner.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/thread_collision_warner.h" +#include "base/threading/thread_collision_warner.h" #include "base/logging.h" #include "base/threading/platform_thread.h" diff --git a/base/thread_collision_warner.h b/base/threading/thread_collision_warner.h similarity index 97% rename from base/thread_collision_warner.h rename to base/threading/thread_collision_warner.h index 1e14d1a6306a..17ed5a4717ca 100644 --- a/base/thread_collision_warner.h +++ b/base/threading/thread_collision_warner.h @@ -1,9 +1,9 @@ -// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_THREAD_COLLISION_WARNER_H_ -#define BASE_THREAD_COLLISION_WARNER_H_ +#ifndef BASE_THREADING_THREAD_COLLISION_WARNER_H_ +#define BASE_THREADING_THREAD_COLLISION_WARNER_H_ #pragma once #include @@ -240,4 +240,4 @@ class ThreadCollisionWarner { } // namespace base -#endif // BASE_THREAD_COLLISION_WARNER_H_ +#endif // BASE_THREADING_THREAD_COLLISION_WARNER_H_ diff --git a/base/thread_collision_warner_unittest.cc b/base/threading/thread_collision_warner_unittest.cc similarity index 99% rename from base/thread_collision_warner_unittest.cc rename to base/threading/thread_collision_warner_unittest.cc index d7e1732dd862..68987c3b125b 100644 --- a/base/thread_collision_warner_unittest.cc +++ b/base/threading/thread_collision_warner_unittest.cc @@ -7,7 +7,7 @@ #include "base/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" -#include "base/thread_collision_warner.h" +#include "base/threading/thread_collision_warner.h" #include "testing/gtest/include/gtest/gtest.h" // '' : local class member function does not have a body diff --git a/base/thread_restrictions.cc b/base/threading/thread_restrictions.cc similarity index 97% rename from base/thread_restrictions.cc rename to base/threading/thread_restrictions.cc index 6a7c60ae3a48..a0c24b00a3b9 100644 --- a/base/thread_restrictions.cc +++ b/base/threading/thread_restrictions.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/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" // This entire file is compiled out in Release mode. #ifndef NDEBUG diff --git a/base/thread_restrictions.h b/base/threading/thread_restrictions.h similarity index 96% rename from base/thread_restrictions.h rename to base/threading/thread_restrictions.h index 51e5a156a832..de8174f213fb 100644 --- a/base/thread_restrictions.h +++ b/base/threading/thread_restrictions.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_THREAD_RESTRICTIONS_H_ -#define BASE_THREAD_RESTRICTIONS_H_ +#ifndef BASE_THREADING_THREAD_RESTRICTIONS_H_ +#define BASE_THREADING_THREAD_RESTRICTIONS_H_ #include "base/basictypes.h" @@ -97,4 +97,4 @@ class ThreadRestrictions { } // namespace base -#endif // BASE_THREAD_RESTRICTIONS_H_ +#endif // BASE_THREADING_THREAD_RESTRICTIONS_H_ diff --git a/base/thread_unittest.cc b/base/threading/thread_unittest.cc similarity index 99% rename from base/thread_unittest.cc rename to base/threading/thread_unittest.cc index 6eff10269002..3748fc34c43d 100644 --- a/base/thread_unittest.cc +++ b/base/threading/thread_unittest.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/thread.h" +#include "base/threading/thread.h" #include diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc index edb842d400ca..779c23673d15 100644 --- a/base/tools_sanity_unittest.cc +++ b/base/tools_sanity_unittest.cc @@ -4,7 +4,7 @@ #include "base/message_loop.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc index 1d04b12a132b..36460000249d 100644 --- a/base/tracked_objects.cc +++ b/base/tracked_objects.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" using base::TimeDelta; diff --git a/base/weak_ptr_unittest.cc b/base/weak_ptr_unittest.cc index b80840118328..bcaca9e18dd4 100644 --- a/base/weak_ptr_unittest.cc +++ b/base/weak_ptr_unittest.cc @@ -4,7 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/scoped_ptr.h" #include "base/weak_ptr.h" diff --git a/base/win/registry.cc b/base/win/registry.cc index f8e05a7d0257..dbb8d7a2d0b6 100644 --- a/base/win/registry.cc +++ b/base/win/registry.cc @@ -7,7 +7,7 @@ #include #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #pragma comment(lib, "shlwapi.lib") // for SHDeleteKey diff --git a/base/win/win_util.cc b/base/win/win_util.cc index cce3d9c452e3..afd16f447084 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -17,7 +17,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/win/windows_version.h" namespace base { diff --git a/ceee/ie/broker/chrome_postman.h b/ceee/ie/broker/chrome_postman.h index 33d94188a22d..3978b11ff41c 100644 --- a/ceee/ie/broker/chrome_postman.h +++ b/ceee/ie/broker/chrome_postman.h @@ -9,7 +9,7 @@ #define CEEE_IE_BROKER_CHROME_POSTMAN_H_ #include "base/singleton.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "ceee/ie/common/chrome_frame_host.h" #include "broker_lib.h" // NOLINT diff --git a/ceee/ie/plugin/bho/executor_com_unittest.cc b/ceee/ie/plugin/bho/executor_com_unittest.cc index c1379a8c72f8..8478825700ec 100644 --- a/ceee/ie/plugin/bho/executor_com_unittest.cc +++ b/ceee/ie/plugin/bho/executor_com_unittest.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/win/registry.h" #include "base/win/windows_version.h" #include "ceee/common/initializing_coclass.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index b782c2cf5bbc..67d4af2d98b7 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -19,7 +19,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 1b6973dcbf2d..770376523628 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -15,7 +15,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/automation/automation_provider.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 103225bc091e..d25c07cd08e8 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -13,7 +13,7 @@ #include "base/process.h" #include "base/process_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index c0b045becae1..4522bc29966c 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -22,7 +22,7 @@ #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/tracked_objects.h" #include "base/utf_string_conversions.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index ea9eacab2e12..a544ec11a2de 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -28,7 +28,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d60b672dc87b..99cec2fd01fd 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -12,8 +12,8 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/task.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/waitable_event.h" #include "chrome/browser/appcache/chrome_appcache_service.h" #include "chrome/browser/automation/automation_provider_list.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 67f5b9df0c1a..72c035023e05 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -15,8 +15,8 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "build/build_config.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/browser_thread.cc b/chrome/browser/browser_thread.cc index e6edfd0ce9f1..60d445015351 100644 --- a/chrome/browser/browser_thread.cc +++ b/chrome/browser/browser_thread.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" // Friendly names for the well-known threads. static const char* browser_thread_names[BrowserThread::ID_COUNT] = { diff --git a/chrome/browser/browser_thread.h b/chrome/browser/browser_thread.h index f6a022e35ebd..ce3c295ca1a7 100644 --- a/chrome/browser/browser_thread.h +++ b/chrome/browser/browser_thread.h @@ -8,7 +8,7 @@ #include "base/lock.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" namespace base { class MessageLoopProxy; diff --git a/chrome/browser/child_process_launcher.cc b/chrome/browser/child_process_launcher.cc index 8ba6941485bc..6058cc8cd71f 100644 --- a/chrome/browser/child_process_launcher.cc +++ b/chrome/browser/child_process_launcher.cc @@ -10,7 +10,7 @@ #include "base/lock.h" #include "base/logging.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_descriptors.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index b40505707011..9656639bb713 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -16,8 +16,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/dom_ui/system_info_ui.cc b/chrome/browser/chromeos/dom_ui/system_info_ui.cc index 857c560c2ffb..71f98653f093 100644 --- a/chrome/browser/chromeos/dom_ui/system_info_ui.cc +++ b/chrome/browser/chromeos/dom_ui/system_info_ui.cc @@ -11,7 +11,7 @@ #include "base/path_service.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/google_update_chromeos.cc b/chrome/browser/chromeos/google_update_chromeos.cc index 88a63d98826d..fb3030bea2fc 100644 --- a/chrome/browser/chromeos/google_update_chromeos.cc +++ b/chrome/browser/chromeos/google_update_chromeos.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/login/camera.cc b/chrome/browser/chromeos/login/camera.cc index 59e77d32b3b3..bfc8136bf7dc 100644 --- a/chrome/browser/chromeos/login/camera.cc +++ b/chrome/browser/chromeos/login/camera.cc @@ -22,7 +22,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "chrome/browser/browser_thread.h" #include "gfx/size.h" diff --git a/chrome/browser/chromeos/login/camera.h b/chrome/browser/chromeos/login/camera.h index a82f1978dd9c..c30f2dfbec16 100644 --- a/chrome/browser/chromeos/login/camera.h +++ b/chrome/browser/chromeos/login/camera.h @@ -11,7 +11,7 @@ #include "base/lock.h" #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "third_party/skia/include/core/SkBitmap.h" class Task; diff --git a/chrome/browser/chromeos/login/user_image_screen.h b/chrome/browser/chromeos/login/user_image_screen.h index c17a5856d7cc..9a3fef8a5658 100644 --- a/chrome/browser/chromeos/login/user_image_screen.h +++ b/chrome/browser/chromeos/login/user_image_screen.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_ #pragma once -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/chromeos/login/camera.h" #include "chrome/browser/chromeos/login/user_image_view.h" #include "chrome/browser/chromeos/login/view_screen.h" diff --git a/chrome/browser/chromeos/pulse_audio_mixer.h b/chrome/browser/chromeos/pulse_audio_mixer.h index 33f7c1ca68dd..f01e738c1339 100644 --- a/chrome/browser/chromeos/pulse_audio_mixer.h +++ b/chrome/browser/chromeos/pulse_audio_mixer.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/lock.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" struct pa_context; struct pa_cvolume; diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 2e0bb11a7209..3cb8eb34b90b 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc index 196352aff261..a22ff9573cd8 100644 --- a/chrome/browser/crash_handler_host_linux.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -22,7 +22,7 @@ #include "base/singleton.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "breakpad/src/client/linux/handler/exception_handler.h" #include "breakpad/src/client/linux/minidump_writer/linux_dumper.h" #include "breakpad/src/client/linux/minidump_writer/minidump_writer.h" diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc index 1aaf18be6aae..6f2deb47df1b 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h index 56835eb9b943..6bba3bae6b58 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h +++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h @@ -20,12 +20,12 @@ #include #endif -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/basictypes.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/debugger/devtools_remote.h" #include "chrome/browser/debugger/devtools_remote_listen_socket.h" #include "chrome/browser/debugger/devtools_remote_message.h" diff --git a/chrome/browser/device_orientation/provider_impl.cc b/chrome/browser/device_orientation/provider_impl.cc index dfe994a09f02..330740d8c0a0 100644 --- a/chrome/browser/device_orientation/provider_impl.cc +++ b/chrome/browser/device_orientation/provider_impl.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/device_orientation/orientation.h" #include "chrome/browser/device_orientation/provider_impl.h" diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 42af812b9c77..5b69fe543baa 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -12,7 +12,7 @@ #include "base/ref_counted_memory.h" #include "base/singleton.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/values.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc b/chrome/browser/dom_ui/dom_ui_screenshot_source.cc index 110a52e0764b..215876f798dd 100644 --- a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc +++ b/chrome/browser/dom_ui/dom_ui_screenshot_source.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/ref_counted_memory.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc index 07ca6fc77e45..c6a22ec2bac3 100644 --- a/chrome/browser/dom_ui/downloads_dom_handler.cc +++ b/chrome/browser/dom_ui/downloads_dom_handler.cc @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/singleton.h" #include "base/string_piece.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 9c033ea4440e..2ef2656577c0 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.cc @@ -8,7 +8,7 @@ #include "app/resource_bundle.h" #include "base/singleton.h" #include "base/string_piece.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/values.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc index 41ab3c22ee32..833341c2ef0b 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.cc +++ b/chrome/browser/dom_ui/filebrowse_ui.cc @@ -15,7 +15,7 @@ #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index faf00cb33954..89b3b7c51d57 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -17,7 +17,7 @@ #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index fa7c3321a861..c599a7646a5d 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -16,7 +16,7 @@ #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc index 85c53f67803c..2f1cec700554 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.cc +++ b/chrome/browser/dom_ui/mediaplayer_ui.cc @@ -12,7 +12,7 @@ #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/values.h" #include "base/weak_ptr.h" diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc index 798a600beb1c..d4f724ca9678 100644 --- a/chrome/browser/dom_ui/most_visited_handler.cc +++ b/chrome/browser/dom_ui/most_visited_handler.cc @@ -15,7 +15,7 @@ #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/values.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index c75bdf0b669f..c43a8f5017be 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -15,7 +15,7 @@ #include "base/metrics/histogram.h" #include "base/singleton.h" #include "base/string_number_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/app_launcher_handler.h" diff --git a/chrome/browser/dom_ui/options/advanced_options_utils_win.cc b/chrome/browser/dom_ui/options/advanced_options_utils_win.cc index 0bb0a8ae5e9f..7cf6f454a16d 100644 --- a/chrome/browser/dom_ui/options/advanced_options_utils_win.cc +++ b/chrome/browser/dom_ui/options/advanced_options_utils_win.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" diff --git a/chrome/browser/dom_ui/options/import_data_handler.cc b/chrome/browser/dom_ui/options/import_data_handler.cc index 85fd5712612b..03d77166bbaa 100644 --- a/chrome/browser/dom_ui/options/import_data_handler.cc +++ b/chrome/browser/dom_ui/options/import_data_handler.cc @@ -11,7 +11,7 @@ #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc index 36014a199be6..932de341c1a5 100644 --- a/chrome/browser/dom_ui/options/options_ui.cc +++ b/chrome/browser/dom_ui/options/options_ui.cc @@ -14,7 +14,7 @@ #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/browser_about_handler.h" diff --git a/chrome/browser/dom_ui/shared_resources_data_source.cc b/chrome/browser/dom_ui/shared_resources_data_source.cc index 6ff834374310..709b33c2dee2 100644 --- a/chrome/browser/dom_ui/shared_resources_data_source.cc +++ b/chrome/browser/dom_ui/shared_resources_data_source.cc @@ -8,7 +8,7 @@ #include "app/resource_bundle.h" #include "base/singleton.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc index da8a8075d8d9..a086372f159b 100644 --- a/chrome/browser/dom_ui/slideshow_ui.cc +++ b/chrome/browser/dom_ui/slideshow_ui.cc @@ -11,7 +11,7 @@ #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index bebfe0641eee..f00db3659bad 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -22,7 +22,7 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc index 2c432a706606..5b25ea63ffd4 100644 --- a/chrome/browser/download/save_file_manager.cc +++ b/chrome/browser/download/save_file_manager.cc @@ -11,7 +11,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/download/save_file.h" #include "chrome/browser/download/save_package.h" diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index 7bda1bb541d1..23c062c83cfb 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -17,7 +17,7 @@ #include "base/string_split.h" #include "base/utf_string_conversions.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_item.h" diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc index e9191894b5d1..751658bea634 100644 --- a/chrome/browser/extensions/autoupdate_interceptor.cc +++ b/chrome/browser/extensions/autoupdate_interceptor.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/autoupdate_interceptor.h" #include "base/file_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_thread.h" #include "net/url_request/url_request_test_job.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index f6708c502a2d..1593aeacaa8c 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -16,7 +16,7 @@ #include "base/stringprintf.h" #include "base/time.h" #include "base/task.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index e95f18dcdf67..363e7fc14ae8 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" diff --git a/chrome/browser/extensions/extension_rlz_module.cc b/chrome/browser/extensions/extension_rlz_module.cc index 4f76bccb74af..bd85cf18c686 100644 --- a/chrome/browser/extensions/extension_rlz_module.cc +++ b/chrome/browser/extensions/extension_rlz_module.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/extension_rlz_module.h" #include "base/scoped_ptr.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" #include "rlz/win/lib/lib_values.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index bb24e1e51bfd..843584c265b1 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -15,7 +15,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index 63374ac8c052..04fb637e7304 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -17,7 +17,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_error_reporter.h" diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index d501de6406a5..d806b6eb6746 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -11,7 +11,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_error_reporter.h" diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 3fcc861d77b2..ec1f9bdb13f6 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -15,7 +15,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/debugger/devtools_manager.h" diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index cd40fd5740d3..fe735ae5bc02 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/extensions/user_script_listener.h" #include "chrome/browser/renderer_host/global_request_id.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 2af102e9f090..820ab5a333c8 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -13,7 +13,7 @@ #include "base/pickle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc index 49c0061a480d..e9b4326be9cb 100644 --- a/chrome/browser/external_protocol_handler.cc +++ b/chrome/browser/external_protocol_handler.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/file_path_watcher/file_path_watcher_inotify.cc b/chrome/browser/file_path_watcher/file_path_watcher_inotify.cc index c65b22da3cc2..bc59a2e9d946 100644 --- a/chrome/browser/file_path_watcher/file_path_watcher_inotify.cc +++ b/chrome/browser/file_path_watcher/file_path_watcher_inotify.cc @@ -26,7 +26,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" namespace { diff --git a/chrome/browser/file_system/file_system_dispatcher_host.cc b/chrome/browser/file_system/file_system_dispatcher_host.cc index 98b14a54685f..cf28585f133a 100644 --- a/chrome/browser/file_system/file_system_dispatcher_host.cc +++ b/chrome/browser/file_system/file_system_dispatcher_host.cc @@ -8,7 +8,7 @@ #include #include "base/file_path.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/net/chrome_url_request_context.h" diff --git a/chrome/browser/geolocation/gateway_data_provider_common.h b/chrome/browser/geolocation/gateway_data_provider_common.h index 6bc6f906a3d3..cc1c85a07989 100644 --- a/chrome/browser/geolocation/gateway_data_provider_common.h +++ b/chrome/browser/geolocation/gateway_data_provider_common.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/geolocation/device_data_provider.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_provider.cc b/chrome/browser/geolocation/geolocation_provider.cc index 3756af780701..59365b1d1744 100644 --- a/chrome/browser/geolocation/geolocation_provider.cc +++ b/chrome/browser/geolocation/geolocation_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/geolocation/geolocation_provider.h" #include "base/singleton.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/geolocation/location_arbitrator.h" // This class is guaranteed to outlive its internal thread, so ref counting diff --git a/chrome/browser/geolocation/geolocation_provider.h b/chrome/browser/geolocation/geolocation_provider.h index 9420f57fbff2..f83c4275abc9 100644 --- a/chrome/browser/geolocation/geolocation_provider.h +++ b/chrome/browser/geolocation/geolocation_provider.h @@ -8,7 +8,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/geolocation/geolocation_observer.h" #include "chrome/common/geoposition.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/geolocation/mock_location_provider.h b/chrome/browser/geolocation/mock_location_provider.h index 17f11d847d44..5d77631cb8dc 100644 --- a/chrome/browser/geolocation/mock_location_provider.h +++ b/chrome/browser/geolocation/mock_location_provider.h @@ -9,7 +9,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/geolocation/location_provider.h" #include "chrome/common/geoposition.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/geolocation/network_location_provider.h b/chrome/browser/geolocation/network_location_provider.h index 1e2485b2a30f..0c846d497eca 100644 --- a/chrome/browser/geolocation/network_location_provider.h +++ b/chrome/browser/geolocation/network_location_provider.h @@ -13,7 +13,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/string16.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/geolocation/device_data_provider.h" #include "chrome/browser/geolocation/location_provider.h" #include "chrome/browser/geolocation/network_location_request.h" diff --git a/chrome/browser/geolocation/wifi_data_provider_common.h b/chrome/browser/geolocation/wifi_data_provider_common.h index 5f0ee0ae780c..c647c06f080b 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common.h +++ b/chrome/browser/geolocation/wifi_data_provider_common.h @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/geolocation/device_data_provider.h" // Converts a MAC address stored as an array of uint8 to a string. diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index fc7f324cb5e2..6ed8952562cf 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -13,7 +13,7 @@ #include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_thread.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc index 9e374c462b13..b0d793154de0 100644 --- a/chrome/browser/gpu_process_host.cc +++ b/chrome/browser/gpu_process_host.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/gpu_blacklist.h" #include "chrome/browser/gpu_process_host_ui_shim.h" diff --git a/chrome/browser/gtk/dialogs_gtk.cc b/chrome/browser/gtk/dialogs_gtk.cc index 1814e9286852..71886207ce94 100644 --- a/chrome/browser/gtk/dialogs_gtk.cc +++ b/chrome/browser/gtk/dialogs_gtk.cc @@ -13,8 +13,8 @@ #include "base/message_loop.h" #include "base/mime_util.h" #include "base/sys_string_conversions.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/shell_dialogs.h" diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 21fe182b7960..3d5b904df6d4 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -19,7 +19,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_tokenizer.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/nix/xdg_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc index 2452b4a6b0bd..52f5e2cecbe8 100644 --- a/chrome/browser/icon_loader_linux.cc +++ b/chrome/browser/icon_loader_linux.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/mime_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/string_util.h" #include "gfx/codec/png_codec.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm index 441d12a0496a..e14bde7aae01 100644 --- a/chrome/browser/icon_loader_mac.mm +++ b/chrome/browser/icon_loader_mac.mm @@ -7,7 +7,7 @@ #import #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/sys_string_conversions.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index dfa115c3d0d6..c708fb69f929 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc @@ -8,7 +8,7 @@ #include #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "gfx/icon_util.h" #include "gfx/size.h" diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 558eb1720d37..e79fbbaa8866 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -5,7 +5,7 @@ #include "chrome/browser/importer/importer.h" #include "app/l10n_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 68e5c96d3485..00e8dcf94a6f 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -5,7 +5,7 @@ #include "chrome/browser/importer/profile_writer.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/in_process_webkit/webkit_thread.h b/chrome/browser/in_process_webkit/webkit_thread.h index 76e973078930..856007c7b86e 100644 --- a/chrome/browser/in_process_webkit/webkit_thread.h +++ b/chrome/browser/in_process_webkit/webkit_thread.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/lock.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" class BrowserWebKitClientImpl; diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index f20c8a6c507c..7af736c821ae 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -14,7 +14,7 @@ #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/gpu_process_host.h" #include "chrome/browser/net/chrome_net_log.h" diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc index a2f63c0c921b..ea1cf27221d9 100644 --- a/chrome/browser/jankometer.cc +++ b/chrome/browser/jankometer.cc @@ -14,7 +14,7 @@ #include "base/ref_counted.h" #include "base/string_util.h" #include "base/threading/watchdog.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 5337df7da57e..58ad7d3927a8 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -19,7 +19,7 @@ #include "base/path_service.h" #include "base/scoped_comptr_win.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index 09a298f9ef81..2ecac8dcf552 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -14,7 +14,7 @@ #include "base/mac_util.h" #include "base/string_util.h" #include "base/process_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index 2bfbebd4ecb1..06c619e6f913 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -6,7 +6,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/metrics/histogram_synchronizer.cc b/chrome/browser/metrics/histogram_synchronizer.cc index 3a5ae08b58e2..a44b7389b5b5 100644 --- a/chrome/browser/metrics/histogram_synchronizer.cc +++ b/chrome/browser/metrics/histogram_synchronizer.cc @@ -6,7 +6,7 @@ #include "base/metrics/histogram.h" #include "base/logging.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 3669f5b4f232..a5394c0a178d 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -161,7 +161,7 @@ #include "base/md5.h" #include "base/metrics/histogram.h" #include "base/string_number_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 588cf57d0e87..18960ebf8049 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/firefox_proxy_settings.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc index 40a583e14c05..89b3fc3e0105 100644 --- a/chrome/browser/net/predictor_api.cc +++ b/chrome/browser/net/predictor_api.cc @@ -11,7 +11,7 @@ #include "base/lazy_instance.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/values.h" #include "base/waitable_event.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 03abf803ffef..622ee50dca2e 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -17,7 +17,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index d024f72b6d13..d3eb2a1b264f 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/ssl_config_service_manager.h" diff --git a/chrome/browser/net/url_request_mock_http_job.cc b/chrome/browser/net/url_request_mock_http_job.cc index a2e46d84b332..36113085693f 100644 --- a/chrome/browser/net/url_request_mock_http_job.cc +++ b/chrome/browser/net/url_request_mock_http_job.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "net/base/net_util.h" diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc index d29e8832d6ed..b69ec5e1fb27 100644 --- a/chrome/browser/net/url_request_mock_util.cc +++ b/chrome/browser/net/url_request_mock_util.cc @@ -7,7 +7,7 @@ #include #include "base/path_service.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/net/url_request_failed_dns_job.h" #include "chrome/browser/net/url_request_mock_http_job.h" diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index afc01c732557..a1eaeb3b956d 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/metrics/histogram.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc index bb8ba7e3af78..d699053c7f5c 100644 --- a/chrome/browser/oom_priority_manager.cc +++ b/chrome/browser/oom_priority_manager.cc @@ -8,7 +8,7 @@ #include "base/process.h" #include "base/process_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "build/build_config.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h index 4ab5575f02ef..1ac6f8bf9f17 100644 --- a/chrome/browser/password_manager/password_store.h +++ b/chrome/browser/password_manager/password_store.h @@ -10,7 +10,7 @@ #include #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/password_manager/password_store_mac.h b/chrome/browser/password_manager/password_store_mac.h index 8a7033810b12..371fd217bd19 100644 --- a/chrome/browser/password_manager/password_store_mac.h +++ b/chrome/browser/password_manager/password_store_mac.h @@ -9,7 +9,7 @@ #include #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/password_manager/login_database.h" #include "chrome/browser/password_manager/password_store.h" diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index ee7cd8115827..9941233eecf3 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/waitable_event.h" diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc index 13a0d31a528a..aee03ee8dcb5 100644 --- a/chrome/browser/printing/print_dialog_cloud_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/singleton.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc index 585daf4132f9..eac9bbe5d2c3 100644 --- a/chrome/browser/printing/print_dialog_gtk.cc +++ b/chrome/browser/printing/print_dialog_gtk.cc @@ -13,7 +13,7 @@ #include "base/lazy_instance.h" #include "base/lock.h" #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index db571036783c..493d317606a0 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -5,7 +5,7 @@ #include "chrome/browser/printing/print_job.h" #include "base/message_loop.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/timer.h" #include "chrome/browser/printing/print_job_worker.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index e5682862f05c..50aec1b45988 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h @@ -9,7 +9,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "gfx/native_widget_types.h" #include "printing/page_number.h" #include "printing/printing_context.h" diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc index 87ec00fdf4ce..89f0e97d9a5f 100644 --- a/chrome/browser/printing/printer_query.cc +++ b/chrome/browser/printing/printer_query.cc @@ -5,7 +5,7 @@ #include "chrome/browser/printing/printer_query.h" #include "base/message_loop.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/printing/print_job_worker.h" namespace printing { diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc index 0f2008024ed3..85adb19bcb64 100644 --- a/chrome/browser/process_info_snapshot_mac.cc +++ b/chrome/browser/process_info_snapshot_mac.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" // Implementation for the Mac; calls '/bin/ps' for information when // |Sample()| is called. diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc index 73e136542b5c..6abcefeaf871 100644 --- a/chrome/browser/process_singleton_linux_uitest.cc +++ b/chrome/browser/process_singleton_linux_uitest.cc @@ -14,7 +14,7 @@ #include "base/eintr_wrapper.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc index f04b29f0d000..9bb596b4811d 100644 --- a/chrome/browser/process_singleton_uitest.cc +++ b/chrome/browser/process_singleton_uitest.cc @@ -18,7 +18,7 @@ #include "base/process_util.h" #include "base/ref_counted.h" #include "base/scoped_temp_dir.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 886111c46760..f09fd571ec93 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -25,8 +25,8 @@ #include "base/platform_file.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/appcache/appcache_dispatcher_host.h" #include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/renderer_host/database_message_filter.cc b/chrome/browser/renderer_host/database_message_filter.cc index b8258f97bc37..4ae0aca83930 100644 --- a/chrome/browser/renderer_host/database_message_filter.cc +++ b/chrome/browser/renderer_host/database_message_filter.cc @@ -7,7 +7,7 @@ #include #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/chrome_url_request_context.h" diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc index 5f638ab57ecf..1f86ca855f0d 100644 --- a/chrome/browser/renderer_host/render_message_filter.cc +++ b/chrome/browser/renderer_host/render_message_filter.cc @@ -13,7 +13,7 @@ #include "base/shared_memory.h" #include "base/sys_string_conversions.h" #include "base/threading/worker_pool.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/automation/automation_resource_message_filter.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc index c3abe805ba3a..0ea4f8ca17fe 100644 --- a/chrome/browser/renderer_host/render_widget_helper.cc +++ b/chrome/browser/renderer_host/render_widget_helper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/renderer_host/render_widget_helper.h" #include "base/eintr_wrapper.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 6255d53492f7..46d341dd77fc 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -16,7 +16,7 @@ #include "base/metrics/histogram.h" #include "base/process_util.h" #include "base/scoped_comptr_win.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/win/scoped_gdi_object.h" #include "chrome/browser/accessibility/browser_accessibility_win.h" #include "chrome/browser/accessibility/browser_accessibility_manager.h" diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index 48ac2621bc94..e0798fc2ec61 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -18,8 +18,8 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc index 834d09a6b9d8..7e5b9ffb7dc1 100644 --- a/chrome/browser/search_engines/search_terms_data.cc +++ b/chrome/browser/search_engines/search_terms_data.cc @@ -5,7 +5,7 @@ #include "chrome/browser/search_engines/search_terms_data.h" #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/google/google_url_tracker.h" diff --git a/chrome/browser/search_engines/template_url_model_test_util.cc b/chrome/browser/search_engines/template_url_model_test_util.cc index e6ebc8d86fb7..7803b12d4d80 100644 --- a/chrome/browser/search_engines/template_url_model_test_util.cc +++ b/chrome/browser/search_engines/template_url_model_test_util.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc index 532fce62e024..9e5477c2d3fb 100644 --- a/chrome/browser/search_engines/template_url_model_unittest.cc +++ b/chrome/browser/search_engines/template_url_model_unittest.cc @@ -7,7 +7,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_notifications.h" diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index 27e3a2dcdb7e..ccce948c723a 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -8,8 +8,8 @@ #include "base/file_path.h" #include "base/process_util.h" #include "base/stl_util-inl.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index aa981f93181f..795761ade2b4 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -6,7 +6,7 @@ #include "base/pickle.h" #include "base/stl_util-inl.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_backend.h" diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index 35ddee585d06..f6c9efa10e25 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -14,7 +14,7 @@ #include "base/metrics/histogram.h" #include "base/pickle.h" #include "base/scoped_vector.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/prefs/session_startup_pref.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index b74df158eb22..accbd585a32c 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -27,7 +27,7 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc index 638c83fe1c54..b2932b317dab 100644 --- a/chrome/browser/spellcheck_host.cc +++ b/chrome/browser/spellcheck_host.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/string_split.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h index 66812257a537..bba7d29d31b9 100644 --- a/chrome/browser/sync/engine/syncer_thread.h +++ b/chrome/browser/sync/engine/syncer_thread.h @@ -18,7 +18,7 @@ #include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/waitable_event.h" #if defined(OS_LINUX) diff --git a/chrome/browser/sync/glue/database_model_worker_unittest.cc b/chrome/browser/sync/glue/database_model_worker_unittest.cc index 8d399b15336b..7f60cea13966 100644 --- a/chrome/browser/sync/glue/database_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/database_model_worker_unittest.cc @@ -5,7 +5,7 @@ #include "base/callback.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/timer.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/sync/glue/database_model_worker.h" diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc index 57fca13788f4..f9aa32cf5e79 100644 --- a/chrome/browser/sync/glue/http_bridge_unittest.cc +++ b/chrome/browser/sync/glue/http_bridge_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop_proxy.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/sync/glue/http_bridge.h" #include "chrome/common/net/test_url_fetcher_factory.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h index fdfc7b45b288..3543a4fa432f 100644 --- a/chrome/browser/sync/glue/sync_backend_host.h +++ b/chrome/browser/sync/glue/sync_backend_host.h @@ -14,7 +14,7 @@ #include "base/lock.h" #include "base/message_loop.h" #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/timer.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/engine/syncapi.h" diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc index e71a2542ad83..28f9b53f0409 100644 --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc @@ -5,7 +5,7 @@ #include "base/callback.h" #include "base/message_loop.h" #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/glue/ui_model_worker.h" diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc index 17795c6584ab..98b70c08c2a4 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -8,7 +8,7 @@ #include "base/ref_counted.h" #include "base/string16.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_notifications.h" diff --git a/chrome/browser/sync/profile_sync_test_util.h b/chrome/browser/sync/profile_sync_test_util.h index f6e66acb4bf3..2dfdbbdee942 100644 --- a/chrome/browser/sync/profile_sync_test_util.h +++ b/chrome/browser/sync/profile_sync_test_util.h @@ -13,7 +13,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index 8548c8dc2133..263b67c348d1 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 30209c74fc38..ac58e0342b64 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -12,7 +12,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 151d5878f3b6..ed8f84856e15 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -14,7 +14,7 @@ #include "base/process_util.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background_contents_service.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 633390099b92..3ddc0cbc3a59 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -8,7 +8,7 @@ #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index a9a731e8e5c9..8d334640c191 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -20,8 +20,8 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "gfx/point.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 98b481db1642..69775524cdd8 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_split.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_list.h" diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm index 92b2f589f183..2148539c1c84 100644 --- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm @@ -19,7 +19,7 @@ #include "base/mac/scoped_cftyperef.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "grit/generated_resources.h" static const int kFileTypePopupTag = 1234; diff --git a/chrome/browser/ui/cocoa/web_drag_source.mm b/chrome/browser/ui/cocoa/web_drag_source.mm index 1fb4c7f59fa4..24c121acf231 100644 --- a/chrome/browser/ui/cocoa/web_drag_source.mm +++ b/chrome/browser/ui/cocoa/web_drag_source.mm @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_manager.h" diff --git a/chrome/browser/ui/options/options_util.cc b/chrome/browser/ui/options/options_util.cc index 0c8ba362d2f5..d23e5e5f8ab9 100644 --- a/chrome/browser/ui/options/options_util.cc +++ b/chrome/browser/ui/options/options_util.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/options/options_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_prefs.h" diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc index 3e5d5d624974..c072d3e45a99 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.cc +++ b/chrome/browser/ui/views/about_ipc_dialog.cc @@ -16,7 +16,7 @@ #include #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index 6f402c3db258..bb081a7fe9d9 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/external_protocol_dialog.cc @@ -9,8 +9,8 @@ #include "app/text_elider.h" #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "base/thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "chrome/browser/external_protocol_handler.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index e6588aaa3da8..81261f750382 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -20,7 +20,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/scoped_callback_factory.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index bc5f92bfd7bd..dc97e8710088 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/scoped_comptr_win.h" #include "base/string_split.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index 7ea25013db23..bf6df2a060a6 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/browser_thread.h" diff --git a/chrome/browser/visitedlink/visitedlink_master.cc b/chrome/browser/visitedlink/visitedlink_master.cc index d93ea46dd318..e4b84446d015 100644 --- a/chrome/browser/visitedlink/visitedlink_master.cc +++ b/chrome/browser/visitedlink/visitedlink_master.cc @@ -21,7 +21,7 @@ #include "base/rand_util.h" #include "base/stack_container.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 4194afda74dc..2c619e265f94 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -18,7 +18,7 @@ #include "base/md5.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index d5ecd0f73561..b359ef5e8dc1 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/stl_util-inl.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/autofill/credit_card.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/worker_host/worker_service.cc b/chrome/browser/worker_host/worker_service.cc index cea298dcc856..ade5db055048 100644 --- a/chrome/browser/worker_host/worker_service.cc +++ b/chrome/browser/worker_host/worker_service.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/singleton.h" #include "base/sys_info.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/worker_host/worker_message_filter.h" #include "chrome/browser/worker_host/worker_process_host.h" diff --git a/chrome/common/child_process.cc b/chrome/common/child_process.cc index af05a6594593..e32bb1b0ec18 100644 --- a/chrome/common/child_process.cc +++ b/chrome/common/child_process.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/string_number_conversions.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/common/child_thread.h" #include "grit/chromium_strings.h" diff --git a/chrome/common/child_process.h b/chrome/common/child_process.h index bc878de2c686..ee32c937afaf 100644 --- a/chrome/common/child_process.h +++ b/chrome/common/child_process.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" class ChildThread; diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc index b74dfad1325a..fb4ac838ed3c 100644 --- a/chrome/common/chrome_plugin_lib.cc +++ b/chrome/common/chrome_plugin_lib.cc @@ -11,7 +11,7 @@ #include "base/path_service.h" #include "base/perftimer.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/threading/platform_thread.h" #include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc index 7bca883d1b3a..ec1012c4deee 100644 --- a/chrome/common/chrome_version_info.cc +++ b/chrome/common/chrome_version_info.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/file_version_info.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "build/build_config.h" namespace chrome { diff --git a/chrome/common/extensions/extension_resource.cc b/chrome/common/extensions/extension_resource.cc index 258b5375f63a..e2a5e24f83a9 100644 --- a/chrome/common/extensions/extension_resource.cc +++ b/chrome/common/extensions/extension_resource.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" ExtensionResource::ExtensionResource() { } diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc index 1ff4342f31c6..e0019119e5d1 100644 --- a/chrome/common/extensions/extension_unpacker.cc +++ b/chrome/common/extensions/extension_unpacker.cc @@ -10,7 +10,7 @@ #include "base/scoped_handle.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "net/base/file_stream.h" diff --git a/chrome/common/important_file_writer.cc b/chrome/common/important_file_writer.cc index 94a8e5758e0f..ceac3fde5c93 100644 --- a/chrome/common/important_file_writer.cc +++ b/chrome/common/important_file_writer.cc @@ -14,7 +14,7 @@ #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" using base::TimeDelta; diff --git a/chrome/common/important_file_writer_unittest.cc b/chrome/common/important_file_writer_unittest.cc index 3d44ae0259fe..c65284193237 100644 --- a/chrome/common/important_file_writer_unittest.cc +++ b/chrome/common/important_file_writer_unittest.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/json_pref_store_unittest.cc b/chrome/common/json_pref_store_unittest.cc index 326e32d3d4c1..2d1e1dfd5d5a 100644 --- a/chrome/common/json_pref_store_unittest.cc +++ b/chrome/common/json_pref_store_unittest.cc @@ -9,7 +9,7 @@ #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/json_pref_store.h" diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc index 0be56e78d45b..4f267af33884 100644 --- a/chrome/common/net/url_fetcher.cc +++ b/chrome/common/net/url_fetcher.cc @@ -13,7 +13,7 @@ #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/common/net/url_request_context_getter.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc index d1f7ef3364e0..47ba221b04ca 100644 --- a/chrome/common/net/url_fetcher_unittest.cc +++ b/chrome/common/net/url_fetcher_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop_proxy.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "build/build_config.h" #include "chrome/common/chrome_plugin_lib.h" diff --git a/chrome/common/worker_thread_ticker.cc b/chrome/common/worker_thread_ticker.cc index 452a9ffc66e4..909cc8d547e2 100644 --- a/chrome/common/worker_thread_ticker.cc +++ b/chrome/common/worker_thread_ticker.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" class WorkerThreadTicker::TimerTask : public Task { public: diff --git a/chrome/common/worker_thread_ticker.h b/chrome/common/worker_thread_ticker.h index d392749476c5..d18feec2b80d 100644 --- a/chrome/common/worker_thread_ticker.h +++ b/chrome/common/worker_thread_ticker.h @@ -9,7 +9,7 @@ #include #include "base/lock.h" -#include "base/thread.h" +#include "base/threading/thread.h" // This class provides the following functionality: // It invokes a set of registered handlers at periodic intervals in diff --git a/chrome/default_plugin/plugin_install_job_monitor.h b/chrome/default_plugin/plugin_install_job_monitor.h index 5211f4555aca..ff8b96629e6a 100644 --- a/chrome/default_plugin/plugin_install_job_monitor.h +++ b/chrome/default_plugin/plugin_install_job_monitor.h @@ -9,7 +9,7 @@ #include #include "base/logging.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/ref_counted.h" // Provides the plugin installation job monitoring functionality. diff --git a/chrome/gpu/gpu_watchdog_thread.h b/chrome/gpu/gpu_watchdog_thread.h index 343e8d196450..ed5f17ace6cd 100644 --- a/chrome/gpu/gpu_watchdog_thread.h +++ b/chrome/gpu/gpu_watchdog_thread.h @@ -9,7 +9,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" // A thread that intermitently sends tasks to a group of watched message loops // and deliberately crashes if one of them does not respond after a timeout. diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc index 9bf6d010e47e..8621e9fbd992 100644 --- a/chrome/installer/util/google_update_settings.cc +++ b/chrome/installer/util/google_update_settings.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/win/registry.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h index 0c86885e6437..3ddd7f4d2432 100644 --- a/chrome/profile_import/profile_import_thread.h +++ b/chrome/profile_import/profile_import_thread.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/profile_writer.h" diff --git a/chrome/renderer/safe_browsing/scorer_unittest.cc b/chrome/renderer/safe_browsing/scorer_unittest.cc index f523abcf4208..7b46f6fd8a1d 100644 --- a/chrome/renderer/safe_browsing/scorer_unittest.cc +++ b/chrome/renderer/safe_browsing/scorer_unittest.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/renderer/safe_browsing/client_model.pb.h" #include "chrome/renderer/safe_browsing/features.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.h b/chrome/service/cloud_print/cloud_print_proxy_backend.h index 7e821902482d..4ef417cc14df 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.h +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.h @@ -8,7 +8,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "printing/backend/print_backend.h" class CloudPrintProxyService; diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index d02b7aabf12c..95ac11bc1dd3 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/message_loop_proxy.h" #include "base/ref_counted.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/service/service_process.h" diff --git a/chrome/service/cloud_print/job_status_updater.h b/chrome/service/cloud_print/job_status_updater.h index 1cf4c0bccaf6..aa271deb705f 100644 --- a/chrome/service/cloud_print/job_status_updater.h +++ b/chrome/service/cloud_print/job_status_updater.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/service/cloud_print/cloud_print_url_fetcher.h" #include "chrome/service/cloud_print/print_system.h" #include "googleurl/src/gurl.h" diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h index f32c1d9d18f6..4fb5e850153f 100644 --- a/chrome/service/cloud_print/printer_job_handler.h +++ b/chrome/service/cloud_print/printer_job_handler.h @@ -13,7 +13,7 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/message_loop_proxy.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "chrome/service/cloud_print/cloud_print_url_fetcher.h" #include "chrome/service/cloud_print/job_status_updater.h" diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h index 66ee79ff97f3..e1674dc5d0a4 100644 --- a/chrome/service/service_process.h +++ b/chrome/service/service_process.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "chrome/service/cloud_print/cloud_print_proxy.h" #include "chrome/service/remoting/chromoting_host_manager.h" diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 60677f7bcce8..1852c49714a1 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -16,7 +16,7 @@ #include "base/process_util.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/automation_constants.h" diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h index f0a9ac57288f..27b87d4f9f55 100644 --- a/chrome/test/automation/window_proxy.h +++ b/chrome/test/automation/window_proxy.h @@ -14,7 +14,7 @@ #include "app/keyboard_codes.h" #include "base/string16.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome/test/automation/automation_handle_tracker.h" class BrowserProxy; diff --git a/chrome/test/interactive_ui/view_event_test_base.h b/chrome/test/interactive_ui/view_event_test_base.h index f0809d93aba3..f76fcb916b7b 100644 --- a/chrome/test/interactive_ui/view_event_test_base.h +++ b/chrome/test/interactive_ui/view_event_test_base.h @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/window/window_delegate.h" diff --git a/chrome/worker/nativewebworker_impl.cc b/chrome/worker/nativewebworker_impl.cc index 3a5c73a65bb8..d5ac33cc8f80 100644 --- a/chrome/worker/nativewebworker_impl.cc +++ b/chrome/worker/nativewebworker_impl.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" diff --git a/chrome_frame/cfproxy_private.h b/chrome_frame/cfproxy_private.h index 796ed4aa3070..307dcae95556 100644 --- a/chrome_frame/cfproxy_private.h +++ b/chrome_frame/cfproxy_private.h @@ -11,7 +11,7 @@ #include #include #include "chrome_frame/cfproxy.h" -#include "base/thread.h" +#include "base/threading/thread.h" // Since we can't forward declare IPC::Message::Sender or IPC::Channel::Listener #include "ipc/ipc_message.h" #include "ipc/ipc_channel.h" diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 4af3d2c757fb..3a0a58b18da5 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -25,7 +25,7 @@ #include "base/process_util.h" #include "base/string_tokenizer.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/threading/thread_local.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_variant.h" diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h index 598966b81780..0050d14f2824 100644 --- a/chrome_frame/chrome_active_document.h +++ b/chrome_frame/chrome_active_document.h @@ -17,7 +17,7 @@ #include "base/scoped_ptr.h" #include "base/scoped_comptr_win.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome_frame/chrome_frame_activex_base.h" #include "chrome_frame/com_type_info_holder.h" diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 73d4f1daf454..a8395d2ecb81 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -16,7 +16,7 @@ #include "base/scoped_handle.h" #include "base/stack_container.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/timer.h" #include "chrome/common/page_zoom.h" #include "chrome/test/automation/automation_proxy.h" diff --git a/chrome_frame/crash_reporting/nt_loader_unittest.cc b/chrome_frame/crash_reporting/nt_loader_unittest.cc index 2c46eabfe643..2d1f838d4bcd 100644 --- a/chrome_frame/crash_reporting/nt_loader_unittest.cc +++ b/chrome_frame/crash_reporting/nt_loader_unittest.cc @@ -1,19 +1,21 @@ // Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + #include "chrome_frame/crash_reporting/nt_loader.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "base/at_exit.h" +#include "base/environment.h" +#include "base/message_loop.h" +#include "base/scoped_handle.h" +#include "base/scoped_ptr.h" +#include "base/string_util.h" +#include "base/sys_info.h" +#include "base/threading/thread.h" +#include "base/utf_string_conversions.h" #include "chrome_frame/crash_reporting/crash_dll.h" #include "gtest/gtest.h" diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index f44ce39f76e6..5c503a836988 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -4,7 +4,7 @@ #include "chrome_frame/external_tab.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/tracked.h" // #include "base/waitable_event.h" diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index d82e16b14466..7b9570bad703 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -58,7 +58,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome_frame/test/urlmon_moniker_integration_test.cc b/chrome_frame/test/urlmon_moniker_integration_test.cc index 311b0afd6462..4e9c29b93803 100644 --- a/chrome_frame/test/urlmon_moniker_integration_test.cc +++ b/chrome_frame/test/urlmon_moniker_integration_test.cc @@ -6,7 +6,7 @@ #include #include "base/scoped_comptr_win.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome_frame/bho.h" //#include "chrome_frame/urlmon_moniker.h" #include "chrome_frame/test/test_server.h" diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h index dcc0b7b40046..a0c9605d1c1c 100644 --- a/chrome_frame/urlmon_url_request.h +++ b/chrome_frame/urlmon_url_request.h @@ -12,7 +12,7 @@ #include #include "base/lock.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "chrome_frame/plugin_url_request.h" #include "chrome_frame/urlmon_moniker.h" #include "chrome_frame/utils.h" diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index 773b65f44782..97f9284b7128 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -16,7 +16,7 @@ #include "base/lock.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/win/scoped_comptr.h" #include "gfx/rect.h" #include "googleurl/src/gurl.h" diff --git a/chrome_frame/vtable_patch_manager_unittest.cc b/chrome_frame/vtable_patch_manager_unittest.cc index 10c73be59f07..4e04796f09a7 100644 --- a/chrome_frame/vtable_patch_manager_unittest.cc +++ b/chrome_frame/vtable_patch_manager_unittest.cc @@ -5,7 +5,7 @@ #include "chrome_frame/vtable_patch_manager.h" #include #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/scoped_handle.h" #include "gtest/gtest.h" #include "gmock/gmock.h" diff --git a/gpu/command_buffer/service/command_buffer_service_unittest.cc b/gpu/command_buffer/service/command_buffer_service_unittest.cc index 1dee78ebce73..7f06639267ef 100644 --- a/gpu/command_buffer/service/command_buffer_service_unittest.cc +++ b/gpu/command_buffer/service/command_buffer_service_unittest.cc @@ -4,7 +4,7 @@ #include "base/callback.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "gpu/command_buffer/common/cmd_buffer_common.h" #include "gpu/command_buffer/service/command_buffer_service.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index b9533e69c4ca..6d3fdeb3162b 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -5,7 +5,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message_utils.h" diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc index 2abbf0a29a98..138e6acce735 100644 --- a/ipc/ipc_logging.cc +++ b/ipc/ipc_logging.cc @@ -14,7 +14,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "ipc/ipc_switches.h" #include "ipc/ipc_sync_message.h" diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index e580ba434029..32969a37faee 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -17,7 +17,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sync_message_filter.h" diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc index 925aeab89e60..1b0036941305 100644 --- a/ipc/ipc_tests.cc +++ b/ipc/ipc_tests.cc @@ -23,7 +23,7 @@ #include "base/perftimer.h" #include "base/test/perf_test_suite.h" #include "base/test/test_suite.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "ipc/ipc_descriptors.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h index c55cab1ececb..548a307be196 100644 --- a/jingle/notifier/listener/mediator_thread_impl.h +++ b/jingle/notifier/listener/mediator_thread_impl.h @@ -28,7 +28,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/weak_ptr.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/communicator/login.h" diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index 50fb39d7112a..4f08c4605536 100644 --- a/media/audio/audio_input_controller.cc +++ b/media/audio/audio_input_controller.cc @@ -4,7 +4,7 @@ #include "media/audio/audio_input_controller.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "media/base/limits.h" namespace { diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h index cfba450b3f8c..8afb3bd7ef1a 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -8,7 +8,7 @@ #include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager.h" diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 370a20c73735..51364b7b1fc5 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -7,7 +7,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/audio/audio_manager.h" class AudioOutputDispatcher; diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index 62ab504c4ffe..b2bba350fda3 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h @@ -11,7 +11,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h index a5ba17cfa79b..4ae3b64294c5 100644 --- a/media/audio/linux/audio_manager_linux.h +++ b/media/audio/linux/audio_manager_linux.h @@ -10,7 +10,7 @@ #include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/audio/audio_manager_base.h" class AlsaPcmOutputStream; diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h index aa99f73e1331..ee1f882b9a93 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h @@ -15,7 +15,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "media/base/clock.h" #include "media/base/filter_host.h" diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h index 09650de13642..f8b26abb645b 100644 --- a/media/filters/decoder_base.h +++ b/media/filters/decoder_base.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/stl_util-inl.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/base/buffers.h" #include "media/base/callback.h" #include "media/base/filters.h" diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index b47b3c81a017..97631d49e236 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/callback.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/base/filters.h" #include "media/base/mock_ffmpeg.h" #include "media/base/mock_filter_host.h" diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h index 581a0db5bbb9..ea81b09ad284 100644 --- a/media/tools/player_wtl/movie.h +++ b/media/tools/player_wtl/movie.h @@ -11,7 +11,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" template struct DefaultSingletonTraits; class WtlVideoRenderer; diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 4a66bfa15c87..2d49d7c2f618 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/base/callback.h" #include "media/base/filter_collection.h" #include "media/base/media.h" diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 61a2d6584db6..fd36132d2289 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc @@ -11,7 +11,7 @@ #include "base/i18n/file_util_icu.h" #include "base/message_loop.h" #include "base/platform_thread.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" namespace net { diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 10ccc950af66..69a722e2bda3 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -12,7 +12,7 @@ #include "base/nss_util.h" #include "base/task.h" #include "base/threading/worker_pool.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/waitable_event.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h index 6658d91f8654..176dfcbf4f07 100644 --- a/net/base/listen_socket_unittest.h +++ b/net/base/listen_socket_unittest.h @@ -22,7 +22,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/listen_socket.h" #include "net/base/net_util.h" #include "net/base/winsock_init.h" diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc index 1db4bd100f61..c19d18281d94 100644 --- a/net/base/network_change_notifier_linux.cc +++ b/net/base/network_change_notifier_linux.cc @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/eintr_wrapper.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/net_errors.h" #include "net/base/network_change_notifier_netlink_linux.h" @@ -91,7 +91,8 @@ void NetworkChangeNotifierLinux::Thread::OnFileCanReadWithoutBlocking(int fd) { ListenForNotifications(); } -void NetworkChangeNotifierLinux::Thread::OnFileCanWriteWithoutBlocking(int /* fd */) { +void NetworkChangeNotifierLinux::Thread::OnFileCanWriteWithoutBlocking( + int /* fd */) { NOTREACHED(); } diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc index dd93067c7d27..afec17d91f4e 100644 --- a/net/base/network_config_watcher_mac.cc +++ b/net/base/network_config_watcher_mac.cc @@ -9,7 +9,7 @@ #include #include "base/compiler_specific.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/mac/scoped_cftyperef.h" namespace net { diff --git a/net/base/ssl_config_service_win.cc b/net/base/ssl_config_service_win.cc index aca0626413fd..ca20e79725ef 100644 --- a/net/base/ssl_config_service_win.cc +++ b/net/base/ssl_config_service_win.cc @@ -4,7 +4,7 @@ #include "net/base/ssl_config_service_win.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/win/registry.h" using base::TimeDelta; diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index 4eab267591ef..96ef7b01a173 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -14,7 +14,7 @@ #include "base/stringprintf.h" #include "base/sys_info.h" #include "base/threading/worker_pool.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/timer.h" #include "net/base/net_errors.h" diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc index c86955f82a05..241fc049c8d9 100644 --- a/net/disk_cache/disk_cache_perftest.cc +++ b/net/disk_cache/disk_cache_perftest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/perftimer.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/test/test_file_util.h" #include "base/timer.h" #include "net/base/io_buffer.h" diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h index faecc1734889..13b38795cf81 100644 --- a/net/disk_cache/disk_cache_test_base.h +++ b/net/disk_cache/disk_cache_test_base.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/cache_type.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc index ae2f981e0179..6658dc88db22 100644 --- a/net/disk_cache/stress_cache.cc +++ b/net/disk_cache/stress_cache.cc @@ -36,7 +36,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index c492b1bf1ac6..9a69ec3e8c7d 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc index 6c348d2a6ba9..ad1228c90b9a 100644 --- a/net/proxy/multi_threaded_proxy_resolver.cc +++ b/net/proxy/multi_threaded_proxy_resolver.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" #include "net/proxy/proxy_info.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 2cb1259a4c40..f333027d1e8e 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -15,7 +15,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_common_unittest.h" diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index 5aca4ae196df..914a319a53a8 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -12,7 +12,7 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stl_util-inl.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/win/registry.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_config.h" diff --git a/net/proxy/sync_host_resolver_bridge_unittest.cc b/net/proxy/sync_host_resolver_bridge_unittest.cc index 43c829f12a2e..712234dd5d2e 100644 --- a/net/proxy/sync_host_resolver_bridge_unittest.cc +++ b/net/proxy/sync_host_resolver_bridge_unittest.cc @@ -4,7 +4,7 @@ #include "net/proxy/sync_host_resolver_bridge.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index eb8bafb294ee..1ad1f1c0c3aa 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/nss_util.h" #include "base/singleton.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 49e065f39d6b..ee80ca528919 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -68,7 +68,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "base/values.h" #include "net/base/address_list.h" #include "net/base/cert_status_flags.h" diff --git a/net/test/test_server_win.cc b/net/test/test_server_win.cc index e38d0bc50b8d..075b48472f40 100644 --- a/net/test/test_server_win.cc +++ b/net/test/test_server_win.cc @@ -15,7 +15,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_timeouts.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #pragma comment(lib, "crypt32.lib") diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index 88d7d87dc2e9..44672edd1dbf 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc @@ -18,7 +18,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc index 0d6d5e42a31d..30fbc8c68398 100644 --- a/net/tools/dump_cache/upgrade.cc +++ b/net/tools/dump_cache/upgrade.cc @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" diff --git a/net/tools/hresolv/hresolv.cc b/net/tools/hresolv/hresolv.cc index 314ff32e0b9a..16124d767369 100644 --- a/net/tools/hresolv/hresolv.cc +++ b/net/tools/hresolv/hresolv.cc @@ -31,7 +31,7 @@ #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc index d7ebe0a7bf3b..adc6f442b348 100644 --- a/net/url_request/url_request_file_job.cc +++ b/net/url_request/url_request_file_job.cc @@ -24,7 +24,7 @@ #include "base/platform_file.h" #include "base/string_util.h" #include "base/threading/worker_pool.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index 50236fd73040..b13d2682bcbf 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -17,7 +17,7 @@ #include "base/process_util.h" #include "base/string_util.h" #include "base/string16.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "net/base/cert_verifier.h" diff --git a/o3d/import/cross/main_thread_archive_callback_client.h b/o3d/import/cross/main_thread_archive_callback_client.h index 7da39f734308..f1c9db657f43 100644 --- a/o3d/import/cross/main_thread_archive_callback_client.h +++ b/o3d/import/cross/main_thread_archive_callback_client.h @@ -36,7 +36,7 @@ #define O3D_IMPORT_CROSS_MAIN_THREAD_ARCHIVE_CALLBACK_CLIENT_H_ #include "base/basictypes.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "import/cross/archive_processor.h" #include "import/cross/memory_stream.h" diff --git a/o3d/import/cross/threaded_stream_processor.h b/o3d/import/cross/threaded_stream_processor.h index f040eb4715b2..2b5a4e546326 100644 --- a/o3d/import/cross/threaded_stream_processor.h +++ b/o3d/import/cross/threaded_stream_processor.h @@ -37,7 +37,7 @@ #define O3D_IMPORT_CROSS_THREADED_STREAM_PROCESSOR_H_ #include "base/basictypes.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "import/cross/memory_stream.h" namespace o3d { diff --git a/remoting/base/tracer.cc b/remoting/base/tracer.cc index 86aec238a1cb..69f41b15e46c 100644 --- a/remoting/base/tracer.cc +++ b/remoting/base/tracer.cc @@ -14,7 +14,7 @@ #include "base/rand_util.h" #include "base/ref_counted.h" #include "base/stl_util-inl.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/threading/thread_local.h" #include "base/time.h" diff --git a/remoting/client/client_context.cc b/remoting/client/client_context.cc index 64b7cc12453b..bf136c92893b 100644 --- a/remoting/client/client_context.cc +++ b/remoting/client/client_context.cc @@ -6,7 +6,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "remoting/jingle_glue/jingle_thread.h" namespace remoting { diff --git a/remoting/client/client_context.h b/remoting/client/client_context.h index 03273fb531c0..9baa3afa22b5 100644 --- a/remoting/client/client_context.h +++ b/remoting/client/client_context.h @@ -7,7 +7,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "remoting/jingle_glue/jingle_thread.h" namespace remoting { diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index c5d118215fdf..82eeed4dc692 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -9,7 +9,7 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "ppapi/c/pp_input_event.h" #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/rect.h" diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h index f2db25fd317b..bc470e7b9880 100644 --- a/remoting/host/chromoting_host.h +++ b/remoting/host/chromoting_host.h @@ -7,7 +7,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "remoting/base/encoder.h" #include "remoting/host/access_verifier.h" #include "remoting/host/capturer.h" diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc index 560803daccfb..053f4117938a 100644 --- a/remoting/host/chromoting_host_context.cc +++ b/remoting/host/chromoting_host_context.cc @@ -6,7 +6,7 @@ #include -#include "base/thread.h" +#include "base/threading/thread.h" #include "remoting/jingle_glue/jingle_thread.h" namespace remoting { diff --git a/remoting/host/chromoting_host_context.h b/remoting/host/chromoting_host_context.h index 6a823205ff12..47e224afcdba 100644 --- a/remoting/host/chromoting_host_context.h +++ b/remoting/host/chromoting_host_context.h @@ -8,7 +8,7 @@ #include #include "base/gtest_prod_util.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "remoting/jingle_glue/jingle_thread.h" namespace remoting { diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc index 9fc057cc87f0..56ad378b0531 100644 --- a/remoting/host/simple_host_process.cc +++ b/remoting/host/simple_host_process.cc @@ -26,7 +26,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/nss_util.h" #include "base/path_service.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/base/media.h" #include "remoting/base/tracer.h" #include "remoting/host/capturer_fake.h" diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index 1ffbb6f26df2..870c43940412 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -7,7 +7,7 @@ #include #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc index 3c5f69204808..0535e1dca7b6 100644 --- a/webkit/appcache/appcache_response_unittest.cc +++ b/webkit/appcache/appcache_response_unittest.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/pickle.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc index 87df2b0faf32..701fdfa2a609 100644 --- a/webkit/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/appcache/appcache_storage_impl_unittest.cc @@ -5,7 +5,7 @@ #include #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index 0c34cb6e2694..b1d70169fcb5 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -5,7 +5,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/stl_util-inl.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc index 141b909e1033..0cbbac1c77c2 100644 --- a/webkit/appcache/appcache_url_request_job_unittest.cc +++ b/webkit/appcache/appcache_url_request_job_unittest.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/pickle.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index a81f378b9580..ac1c56879a0e 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/scoped_temp_dir.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index bae0d9b6366a..7fdd72a3e85d 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -57,7 +57,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc index e28f84e43b35..925c247f6124 100644 --- a/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc +++ b/webkit/plugins/npapi/test/plugin_thread_async_call_test.cc @@ -6,7 +6,7 @@ #include "base/at_exit.h" #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "webkit/plugins/npapi/test/plugin_client.h" namespace NPAPIClient { diff --git a/webkit/tools/test_shell/simple_appcache_system.h b/webkit/tools/test_shell/simple_appcache_system.h index f4e8b71ca379..14fd2f2c7d87 100644 --- a/webkit/tools/test_shell/simple_appcache_system.h +++ b/webkit/tools/test_shell/simple_appcache_system.h @@ -7,7 +7,7 @@ #include "base/file_path.h" #include "base/message_loop.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "webkit/appcache/appcache_backend_impl.h" #include "webkit/appcache/appcache_frontend_impl.h" #include "webkit/appcache/appcache_service.h" diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index 079968e3d4e4..ce5deeadabae 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -43,7 +43,7 @@ #include "base/ref_counted.h" #include "base/time.h" #include "base/timer.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/waitable_event.h" #include "net/base/cookie_store.h" #include "net/base/file_stream.h" diff --git a/webkit/tools/test_shell/test_shell_request_context.h b/webkit/tools/test_shell/test_shell_request_context.h index 1cb4ec1eaa88..4baebc310d3a 100644 --- a/webkit/tools/test_shell/test_shell_request_context.h +++ b/webkit/tools/test_shell/test_shell_request_context.h @@ -1,11 +1,11 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H__ -#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H__ +#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_ +#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_ -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/http/http_cache.h" #include "net/url_request/url_request_context.h" @@ -42,4 +42,4 @@ class TestShellRequestContext : public URLRequestContext { scoped_ptr blob_storage_controller_; }; -#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H__ +#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_REQUEST_CONTEXT_H_