summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android_webview/browser/net/android_stream_reader_url_request_job.cc2
-rw-r--r--android_webview/native/cookie_manager.cc2
-rw-r--r--base/deferred_sequenced_task_runner_unittest.cc2
-rw-r--r--base/files/file_path_watcher.h2
-rw-r--r--base/files/file_path_watcher_browsertest.cc2
-rw-r--r--base/files/file_path_watcher_kqueue.cc2
-rw-r--r--base/files/file_path_watcher_linux.cc2
-rw-r--r--base/files/file_path_watcher_win.cc2
-rw-r--r--base/files/file_util_proxy.cc2
-rw-r--r--base/message_loop.h2
-rw-r--r--base/message_loop/message_loop_proxy_impl.h2
-rw-r--r--base/observer_list_threadsafe.h2
-rw-r--r--base/prefs/json_pref_store.cc2
-rw-r--r--base/prefs/json_pref_store.h2
-rw-r--r--base/prefs/pref_member.h2
-rw-r--r--base/test/thread_test_helper.h2
-rw-r--r--base/threading/post_task_and_reply_impl.cc2
-rw-r--r--base/threading/sequenced_worker_pool.cc2
-rw-r--r--base/threading/sequenced_worker_pool_unittest.cc2
-rw-r--r--base/threading/thread.h2
-rw-r--r--cc/base/thread_impl.h2
-rw-r--r--chrome/renderer/media/webrtc_logging_handler_impl.cc2
-rw-r--r--chrome/renderer/media/webrtc_logging_message_filter.cc2
-rw-r--r--chromeos/cryptohome/async_method_caller.cc2
-rw-r--r--chromeos/dbus/cros_disks_client.cc2
-rw-r--r--content/browser/browser_thread_impl.cc2
-rw-r--r--content/browser/browser_thread_unittest.cc2
-rw-r--r--content/browser/devtools/devtools_browser_target.cc2
-rw-r--r--content/browser/devtools/devtools_http_handler_impl.cc2
-rw-r--r--content/browser/dom_storage/dom_storage_context_impl.cc2
-rw-r--r--content/browser/download/download_file_impl.cc2
-rw-r--r--content/browser/download/download_resource_handler.cc2
-rw-r--r--content/browser/gamepad/gamepad_provider.cc2
-rw-r--r--content/browser/gamepad/gamepad_provider.h2
-rw-r--r--content/browser/geolocation/fake_access_token_store.cc2
-rw-r--r--content/browser/geolocation/fake_access_token_store.h2
-rw-r--r--content/browser/geolocation/location_api_adapter_android.h2
-rw-r--r--content/browser/geolocation/mock_location_provider.cc2
-rw-r--r--content/browser/loader/redirect_to_file_resource_handler.cc2
-rw-r--r--content/browser/plugin_loader_posix.cc2
-rw-r--r--content/browser/plugin_service_impl.cc2
-rw-r--r--content/browser/power_save_blocker_x11.cc2
-rw-r--r--content/browser/renderer_host/media/web_contents_audio_input_stream.cc2
-rw-r--r--content/browser/renderer_host/media/web_contents_tracker.cc2
-rw-r--r--content/browser/renderer_host/media/web_contents_video_capture_device.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_browsertest.cc2
-rw-r--r--content/browser/streams/stream.cc2
-rw-r--r--content/browser/streams/stream_handle_impl.h2
-rw-r--r--content/child/indexed_db/indexed_db_message_filter.cc2
-rw-r--r--content/child/thread_safe_sender.cc2
-rw-r--r--content/common/gpu/client/gpu_channel_host.cc2
-rw-r--r--content/common/gpu/gpu_channel.cc2
-rw-r--r--content/common/gpu/gpu_channel_manager.h2
-rw-r--r--content/common/gpu/media/exynos_video_decode_accelerator.cc2
-rw-r--r--content/public/browser/browser_thread.h2
-rw-r--r--content/public/test/mock_render_thread.cc2
-rw-r--r--content/renderer/gpu/compositor_output_surface.cc2
-rw-r--r--content/renderer/gpu/input_event_filter.cc2
-rw-r--r--content/renderer/media/audio_input_message_filter.cc2
-rw-r--r--content/renderer/media/audio_message_filter.cc2
-rw-r--r--content/renderer/media/media_stream_dispatcher.cc2
-rw-r--r--content/renderer/media/peer_connection_handler_base.h2
-rw-r--r--content/renderer/media/render_media_log.cc2
-rw-r--r--content/renderer/media/rtc_video_capture_delegate.h2
-rw-r--r--content/renderer/media/rtc_video_decoder_bridge_tv.cc2
-rw-r--r--content/renderer/media/rtc_video_renderer.cc2
-rw-r--r--content/renderer/media/stream_texture_factory_impl_android.cc2
-rw-r--r--content/renderer/media/video_capture_impl_manager.h2
-rw-r--r--content/renderer/media/video_capture_message_filter.h2
-rw-r--r--content/renderer/media/webrtc_local_audio_renderer.cc2
-rw-r--r--content/renderer/p2p/host_address_request.cc2
-rw-r--r--content/renderer/p2p/ipc_socket_factory.cc2
-rw-r--r--content/renderer/p2p/socket_client.cc2
-rw-r--r--content/renderer/p2p/socket_dispatcher.cc2
-rw-r--r--content/renderer/pepper/pepper_hung_plugin_filter.h2
-rw-r--r--content/renderer/pepper/pepper_platform_audio_input_impl.cc2
-rw-r--r--content/renderer/pepper/pepper_platform_audio_output_impl.cc2
-rw-r--r--content/renderer/pepper/pepper_platform_video_capture_impl.cc2
-rw-r--r--content/renderer/render_view_impl.cc2
-rw-r--r--dbus/bus.cc2
-rw-r--r--google_apis/gaia/gaia_oauth_client.h2
-rw-r--r--ipc/ipc_channel_nacl.cc2
-rw-r--r--ipc/ipc_sync_message_filter.cc2
-rw-r--r--jingle/notifier/listener/non_blocking_push_client.cc2
-rw-r--r--jingle/notifier/listener/xmpp_push_client.cc2
-rw-r--r--media/audio/audio_manager_base.cc2
-rw-r--r--media/audio/audio_output_proxy_unittest.cc2
-rw-r--r--media/audio/fake_audio_consumer.cc2
-rw-r--r--media/audio/mac/audio_manager_mac.h2
-rw-r--r--media/audio/mock_audio_manager.cc2
-rw-r--r--media/audio/null_audio_sink.cc2
-rw-r--r--media/audio/scoped_loop_observer.h2
-rw-r--r--media/audio/virtual_audio_input_stream.cc2
-rw-r--r--media/audio/virtual_audio_output_stream.cc2
-rw-r--r--media/audio/virtual_audio_output_stream_unittest.cc2
-rw-r--r--media/base/android/media_player_bridge.cc2
-rw-r--r--media/base/android/media_player_listener.cc2
-rw-r--r--media/base/bind_to_loop.h2
-rw-r--r--media/base/bind_to_loop.h.pump2
-rw-r--r--media/base/serial_runner.cc2
-rw-r--r--media/filters/audio_decoder_selector.cc2
-rw-r--r--media/filters/audio_renderer_impl.cc2
-rw-r--r--media/filters/chunk_demuxer.cc2
-rw-r--r--media/filters/decrypting_audio_decoder.cc2
-rw-r--r--media/filters/decrypting_demuxer_stream.cc2
-rw-r--r--media/filters/decrypting_video_decoder.cc2
-rw-r--r--media/filters/fake_video_decoder.cc2
-rw-r--r--media/filters/ffmpeg_audio_decoder.cc2
-rw-r--r--media/filters/ffmpeg_video_decoder.cc2
-rw-r--r--media/filters/opus_audio_decoder.cc2
-rw-r--r--media/filters/video_decoder_selector.cc2
-rw-r--r--media/filters/video_frame_stream.cc2
-rw-r--r--media/filters/vpx_video_decoder.cc2
-rw-r--r--media/video/capture/video_capture_proxy.cc2
-rw-r--r--net/base/directory_lister.h2
-rw-r--r--net/base/file_stream.cc2
-rw-r--r--net/base/file_stream_context.cc2
-rw-r--r--net/base/upload_file_element_reader_unittest.cc2
-rw-r--r--net/cookies/cookie_monster.cc2
-rw-r--r--net/disk_cache/disk_cache_test_util.cc2
-rw-r--r--net/disk_cache/flash/flash_entry_impl.cc2
-rw-r--r--net/disk_cache/in_flight_backend_io.h2
-rw-r--r--net/disk_cache/in_flight_io.h2
-rw-r--r--net/disk_cache/simple/simple_backend_impl.cc2
-rw-r--r--net/disk_cache/simple/simple_entry_impl.cc2
-rw-r--r--net/dns/host_resolver_impl.cc2
-rw-r--r--net/dns/serial_worker.cc2
-rw-r--r--net/http/http_cache.h2
-rw-r--r--net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc2
-rw-r--r--net/proxy/dhcp_proxy_script_fetcher_win.h2
-rw-r--r--net/proxy/multi_threaded_proxy_resolver.cc2
-rw-r--r--net/proxy/network_delegate_error_observer.cc2
-rw-r--r--net/proxy/network_delegate_error_observer_unittest.cc2
-rw-r--r--net/proxy/polling_proxy_config_service.cc2
-rw-r--r--net/proxy/proxy_resolver_v8_tracing.cc2
-rw-r--r--net/proxy/proxy_service.cc2
-rw-r--r--net/quic/quic_stream_factory.cc2
-rw-r--r--net/ssl/server_bound_cert_service.cc2
-rw-r--r--net/tools/dump_cache/simple_cache_dumper.cc2
-rw-r--r--net/url_request/url_fetcher_impl.cc2
-rw-r--r--net/url_request/url_fetcher_impl_unittest.cc2
-rw-r--r--net/url_request/url_request_test_util.h2
-rw-r--r--ppapi/host/resource_message_filter.cc2
-rw-r--r--ppapi/host/resource_message_filter_unittest.cc2
-rw-r--r--ppapi/proxy/ppapi_proxy_test.cc2
-rw-r--r--ppapi/proxy/ppb_message_loop_proxy.cc2
-rw-r--r--ppapi/shared_impl/ppapi_globals.cc2
-rw-r--r--remoting/client/plugin/pepper_xmpp_proxy.cc2
-rw-r--r--remoting/host/chromoting_host.cc2
-rw-r--r--remoting/host/chromoting_host_unittest.cc1
-rw-r--r--remoting/host/client_session.cc2
-rw-r--r--remoting/host/heartbeat_sender.cc2
-rw-r--r--remoting/host/heartbeat_sender_unittest.cc2
-rw-r--r--remoting/host/host_mock_objects.cc2
-rw-r--r--remoting/host/log_to_server.cc2
-rw-r--r--remoting/host/log_to_server_unittest.cc2
-rw-r--r--remoting/host/plugin/host_script_object.cc2
-rw-r--r--remoting/host/policy_hack/policy_watcher_win.cc2
-rw-r--r--remoting/host/url_request_context.cc2
-rw-r--r--remoting/host/video_scheduler.cc2
-rw-r--r--remoting/protocol/client_control_dispatcher.cc2
-rw-r--r--remoting/protocol/client_event_dispatcher.cc2
-rw-r--r--remoting/protocol/connection_to_client.cc2
-rw-r--r--remoting/protocol/connection_to_client_unittest.cc2
-rw-r--r--remoting/protocol/host_control_dispatcher.cc2
-rw-r--r--remoting/protocol/protocol_mock_objects.cc2
-rw-r--r--sync/internal_api/http_bridge.cc2
-rw-r--r--sync/internal_api/http_bridge_unittest.cc2
-rw-r--r--sync/internal_api/public/util/weak_handle.cc2
-rw-r--r--sync/internal_api/sync_manager_impl_unittest.cc2
-rw-r--r--sync/notifier/invalidation_notifier.cc2
-rw-r--r--ui/gl/android/surface_texture_listener.cc2
-rw-r--r--webkit/browser/appcache/appcache_quota_client_unittest.cc2
-rw-r--r--webkit/browser/appcache/appcache_storage_impl.h2
-rw-r--r--webkit/browser/blob/blob_storage_context.cc2
-rw-r--r--webkit/browser/blob/blob_url_request_job.cc2
-rw-r--r--webkit/browser/blob/blob_url_request_job_factory.cc2
-rw-r--r--webkit/browser/database/database_quota_client.cc2
-rw-r--r--webkit/browser/database/database_quota_client.h2
-rw-r--r--webkit/browser/database/database_quota_client_unittest.cc2
-rw-r--r--webkit/browser/database/database_tracker.cc2
-rw-r--r--webkit/browser/database/database_tracker_unittest.cc2
-rw-r--r--webkit/browser/dom_storage/dom_storage_area_unittest.cc2
-rw-r--r--webkit/browser/dom_storage/dom_storage_context_unittest.cc2
-rw-r--r--webkit/browser/dom_storage/dom_storage_task_runner.cc2
-rw-r--r--webkit/browser/fileapi/file_system_dir_url_request_job.h2
-rw-r--r--webkit/browser/fileapi/file_system_quota_client_unittest.cc2
-rw-r--r--webkit/browser/fileapi/file_system_task_runners.cc2
-rw-r--r--webkit/browser/fileapi/file_system_url_request_job.cc2
-rw-r--r--webkit/browser/fileapi/file_system_url_request_job_unittest.cc2
-rw-r--r--webkit/browser/fileapi/file_writer_delegate.cc2
-rw-r--r--webkit/browser/fileapi/isolated_file_util_unittest.cc2
-rw-r--r--webkit/browser/fileapi/isolated_mount_point_provider.cc2
-rw-r--r--webkit/browser/fileapi/local_file_system_operation_write_unittest.cc2
-rw-r--r--webkit/browser/fileapi/local_file_util_unittest.cc2
-rw-r--r--webkit/browser/fileapi/sandbox_file_system_test_helper.cc2
-rw-r--r--webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc2
-rw-r--r--webkit/browser/fileapi/syncable/canned_syncable_file_system.cc2
-rw-r--r--webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc2
-rw-r--r--webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc2
-rw-r--r--webkit/browser/quota/mock_quota_manager_unittest.cc2
-rw-r--r--webkit/browser/quota/mock_storage_client.cc2
-rw-r--r--webkit/browser/quota/quota_manager_unittest.cc2
-rw-r--r--webkit/browser/quota/quota_task.cc2
-rw-r--r--webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc2
-rw-r--r--webkit/browser/quota/usage_tracker.cc2
-rw-r--r--webkit/common/blob/shareable_file_reference_unittest.cc2
-rw-r--r--webkit/common/database/database_connections.cc2
-rw-r--r--webkit/glue/resource_request_body_unittest.cc2
-rw-r--r--webkit/plugins/ppapi/content_decryptor_delegate.cc2
-rw-r--r--webkit/plugins/ppapi/mock_plugin_delegate.cc2
-rw-r--r--webkit/plugins/ppapi/plugin_delegate.h2
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc2
-rw-r--r--webkit/plugins/ppapi/quota_file_io.cc2
-rw-r--r--webkit/renderer/compositor_bindings/web_compositor_support_impl.cc2
-rw-r--r--webkit/renderer/compositor_bindings/web_compositor_support_impl.h2
-rw-r--r--webkit/renderer/media/android/media_source_delegate.cc2
-rw-r--r--webkit/renderer/media/buffered_data_source.cc2
-rw-r--r--webkit/renderer/media/crypto/ppapi_decryptor.cc2
-rw-r--r--webkit/renderer/media/simple_video_frame_provider.cc2
-rw-r--r--webkit/renderer/media/webmediaplayer_impl.cc2
-rw-r--r--webkit/renderer/media/webmediaplayer_params.cc2
-rw-r--r--webkit/support/simple_database_system.cc2
-rw-r--r--webkit/support/simple_file_system.cc2
-rw-r--r--webkit/support/simple_file_writer.cc2
-rw-r--r--webkit/support/simple_resource_loader_bridge.cc2
-rw-r--r--webkit/support/simple_resource_loader_bridge.h2
227 files changed, 227 insertions, 226 deletions
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc
index bcacea0..ae586b8 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc
@@ -14,7 +14,7 @@
#include "base/bind_helpers.h"
#include "base/lazy_instance.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/string_number_conversions.h"
#include "base/task_runner.h"
#include "base/threading/sequenced_worker_pool.h"
diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc
index ab9b92c..b0f477c 100644
--- a/android_webview/native/cookie_manager.cc
+++ b/android_webview/native/cookie_manager.cc
@@ -12,7 +12,7 @@
#include "base/bind_helpers.h"
#include "base/lazy_instance.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_restrictions.h"
#include "content/public/browser/browser_context.h"
diff --git a/base/deferred_sequenced_task_runner_unittest.cc b/base/deferred_sequenced_task_runner_unittest.cc
index c20e174..e0139b6 100644
--- a/base/deferred_sequenced_task_runner_unittest.cc
+++ b/base/deferred_sequenced_task_runner_unittest.cc
@@ -9,7 +9,7 @@
#include "base/bind_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/non_thread_safe.h"
#include "base/threading/thread.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/base/files/file_path_watcher.h b/base/files/file_path_watcher.h
index 3e5c7fc..3c1941f 100644
--- a/base/files/file_path_watcher.h
+++ b/base/files/file_path_watcher.h
@@ -12,7 +12,7 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace base {
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
index 48d8d0d..62ffab9 100644
--- a/base/files/file_path_watcher_browsertest.cc
+++ b/base/files/file_path_watcher_browsertest.cc
@@ -21,7 +21,7 @@
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
diff --git a/base/files/file_path_watcher_kqueue.cc b/base/files/file_path_watcher_kqueue.cc
index 64c9d59..cb856b1 100644
--- a/base/files/file_path_watcher_kqueue.cc
+++ b/base/files/file_path_watcher_kqueue.cc
@@ -14,7 +14,7 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stringprintf.h"
// On some platforms these are not defined.
diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc
index 074eee3..84dce88 100644
--- a/base/files/file_path_watcher_linux.cc
+++ b/base/files/file_path_watcher_linux.cc
@@ -25,7 +25,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/posix/eintr_wrapper.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread.h"
diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc
index 2452922..1cfc143 100644
--- a/base/files/file_path_watcher_win.cc
+++ b/base/files/file_path_watcher_win.cc
@@ -9,7 +9,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "base/win/object_watcher.h"
diff --git a/base/files/file_util_proxy.cc b/base/files/file_util_proxy.cc
index ead5a38..a1c568a 100644
--- a/base/files/file_util_proxy.cc
+++ b/base/files/file_util_proxy.cc
@@ -8,7 +8,7 @@
#include "base/bind_helpers.h"
#include "base/file_util.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner.h"
#include "base/task_runner_util.h"
diff --git a/base/message_loop.h b/base/message_loop.h
index 5013615..2140b911 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -13,7 +13,7 @@
#include "base/callback_forward.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/message_pump.h"
#include "base/observer_list.h"
#include "base/pending_task.h"
diff --git a/base/message_loop/message_loop_proxy_impl.h b/base/message_loop/message_loop_proxy_impl.h
index 9f76794..2269023 100644
--- a/base/message_loop/message_loop_proxy_impl.h
+++ b/base/message_loop/message_loop_proxy_impl.h
@@ -7,7 +7,7 @@
#include "base/base_export.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
namespace base {
diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
index 85b9e6c..7617e2d 100644
--- a/base/observer_list_threadsafe.h
+++ b/base/observer_list_threadsafe.h
@@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/observer_list.h"
#include "base/stl_util.h"
#include "base/threading/platform_thread.h"
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index 0d3d42e..1334abf 100644
--- a/base/prefs/json_pref_store.cc
+++ b/base/prefs/json_pref_store.cc
@@ -12,7 +12,7 @@
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/sequenced_task_runner.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/values.h"
diff --git a/base/prefs/json_pref_store.h b/base/prefs/json_pref_store.h
index 7956764..738b917 100644
--- a/base/prefs/json_pref_store.h
+++ b/base/prefs/json_pref_store.h
@@ -13,7 +13,7 @@
#include "base/files/file_path.h"
#include "base/files/important_file_writer.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/observer_list.h"
#include "base/prefs/base_prefs_export.h"
#include "base/prefs/persistent_pref_store.h"
diff --git a/base/prefs/pref_member.h b/base/prefs/pref_member.h
index 6aeb5f9..08c6070 100644
--- a/base/prefs/pref_member.h
+++ b/base/prefs/pref_member.h
@@ -33,7 +33,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/prefs/base_prefs_export.h"
#include "base/prefs/pref_observer.h"
#include "base/values.h"
diff --git a/base/test/thread_test_helper.h b/base/test/thread_test_helper.h
index 961982c..9521de6 100644
--- a/base/test/thread_test_helper.h
+++ b/base/test/thread_test_helper.h
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
namespace base {
diff --git a/base/threading/post_task_and_reply_impl.cc b/base/threading/post_task_and_reply_impl.cc
index 192198b..f464c6a 100644
--- a/base/threading/post_task_and_reply_impl.cc
+++ b/base/threading/post_task_and_reply_impl.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace base {
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc
index bc69d5c..20210bb 100644
--- a/base/threading/sequenced_worker_pool.cc
+++ b/base/threading/sequenced_worker_pool.cc
@@ -17,7 +17,7 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/memory/linked_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc
index 95e4f11..3d974c0 100644
--- a/base/threading/sequenced_worker_pool_unittest.cc
+++ b/base/threading/sequenced_worker_pool_unittest.cc
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/test/sequenced_worker_pool_owner.h"
diff --git a/base/threading/thread.h b/base/threading/thread.h
index 15f73a0..0944e1e 100644
--- a/base/threading/thread.h
+++ b/base/threading/thread.h
@@ -9,7 +9,7 @@
#include "base/base_export.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/platform_thread.h"
namespace base {
diff --git a/cc/base/thread_impl.h b/cc/base/thread_impl.h
index 064c8bf..473db9c1 100644
--- a/cc/base/thread_impl.h
+++ b/cc/base/thread_impl.h
@@ -7,7 +7,7 @@
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "cc/base/cc_export.h"
#include "cc/base/thread.h"
diff --git a/chrome/renderer/media/webrtc_logging_handler_impl.cc b/chrome/renderer/media/webrtc_logging_handler_impl.cc
index b46ec73..8de461f 100644
--- a/chrome/renderer/media/webrtc_logging_handler_impl.cc
+++ b/chrome/renderer/media/webrtc_logging_handler_impl.cc
@@ -5,7 +5,7 @@
#include "chrome/renderer/media/webrtc_logging_handler_impl.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "chrome/common/partial_circular_buffer.h"
#include "chrome/renderer/media/webrtc_logging_message_filter.h"
diff --git a/chrome/renderer/media/webrtc_logging_message_filter.cc b/chrome/renderer/media/webrtc_logging_message_filter.cc
index f12c695..9a6fcfb 100644
--- a/chrome/renderer/media/webrtc_logging_message_filter.cc
+++ b/chrome/renderer/media/webrtc_logging_message_filter.cc
@@ -5,7 +5,7 @@
#include "chrome/renderer/media/webrtc_logging_message_filter.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "chrome/common/media/webrtc_logging_messages.h"
#include "chrome/renderer/media/webrtc_logging_handler_impl.h"
#include "ipc/ipc_logging.h"
diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc
index 97c64e2..971d707 100644
--- a/chromeos/cryptohome/async_method_caller.cc
+++ b/chromeos/cryptohome/async_method_caller.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/hash_tables.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc
index ba11dc2..7d5a597 100644
--- a/chromeos/dbus/cros_disks_client.cc
+++ b/chromeos/dbus/cros_disks_client.cc
@@ -11,7 +11,7 @@
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
#include "base/task_runner_util.h"
diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc
index a04b935..4220114 100644
--- a/content/browser/browser_thread_impl.cc
+++ b/content/browser/browser_thread_impl.cc
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/thread_restrictions.h"
#include "content/public/browser/browser_thread_delegate.h"
diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc
index ec4b7cc..842906c 100644
--- a/content/browser/browser_thread_unittest.cc
+++ b/content/browser/browser_thread_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind_helpers.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/sequenced_task_runner_helpers.h"
#include "content/browser/browser_thread_impl.h"
#include "content/public/test/test_browser_thread.h"
diff --git a/content/browser/devtools/devtools_browser_target.cc b/content/browser/devtools/devtools_browser_target.cc
index fc563fb..f65be56 100644
--- a/content/browser/devtools/devtools_browser_target.cc
+++ b/content/browser/devtools/devtools_browser_target.cc
@@ -8,7 +8,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/values.h"
#include "net/server/http_server.h"
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index d318ebb..f021768 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -13,7 +13,7 @@
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/dom_storage/dom_storage_context_impl.cc b/content/browser/dom_storage/dom_storage_context_impl.cc
index 1417dd7..74b175b 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.cc
+++ b/content/browser/dom_storage/dom_storage_context_impl.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/files/file_path.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/browser/dom_storage/session_storage_namespace_impl.h"
#include "content/public/browser/browser_thread.h"
#include "webkit/browser/dom_storage/dom_storage_area.h"
diff --git a/content/browser/download/download_file_impl.cc b/content/browser/download/download_file_impl.cc
index b585478..3a1fedc 100644
--- a/content/browser/download/download_file_impl.cc
+++ b/content/browser/download/download_file_impl.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/file_util.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "content/browser/byte_stream.h"
#include "content/browser/download/download_create_info.h"
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index 1abd9c5..fbf060d 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/metrics/stats_counters.h"
#include "base/stringprintf.h"
diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc
index b4fe67f..744f737 100644
--- a/content/browser/gamepad/gamepad_provider.cc
+++ b/content/browser/gamepad/gamepad_provider.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
#include "content/browser/gamepad/gamepad_data_fetcher.h"
diff --git a/content/browser/gamepad/gamepad_provider.h b/content/browser/gamepad/gamepad_provider.h
index c4a7806..90c0568 100644
--- a/content/browser/gamepad/gamepad_provider.h
+++ b/content/browser/gamepad/gamepad_provider.h
@@ -12,7 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/shared_memory.h"
#include "base/synchronization/lock.h"
#include "base/system_monitor/system_monitor.h"
diff --git a/content/browser/geolocation/fake_access_token_store.cc b/content/browser/geolocation/fake_access_token_store.cc
index 6e7a523..bccdcf0 100644
--- a/content/browser/geolocation/fake_access_token_store.cc
+++ b/content/browser/geolocation/fake_access_token_store.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
using base::MessageLoopProxy;
using testing::_;
diff --git a/content/browser/geolocation/fake_access_token_store.h b/content/browser/geolocation/fake_access_token_store.h
index 2d8fe73..4d0867b 100644
--- a/content/browser/geolocation/fake_access_token_store.h
+++ b/content/browser/geolocation/fake_access_token_store.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_BROWSER_GEOLOCATION_FAKE_ACCESS_TOKEN_STORE_H_
#define CONTENT_BROWSER_GEOLOCATION_FAKE_ACCESS_TOKEN_STORE_H_
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/public/browser/access_token_store.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/geolocation/location_api_adapter_android.h b/content/browser/geolocation/location_api_adapter_android.h
index ede23ce..f81ac93 100644
--- a/content/browser/geolocation/location_api_adapter_android.h
+++ b/content/browser/geolocation/location_api_adapter_android.h
@@ -9,7 +9,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
namespace content {
diff --git a/content/browser/geolocation/mock_location_provider.cc b/content/browser/geolocation/mock_location_provider.cc
index 7c083c7..7f68390 100644
--- a/content/browser/geolocation/mock_location_provider.cc
+++ b/content/browser/geolocation/mock_location_provider.cc
@@ -13,7 +13,7 @@
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace content {
MockLocationProvider* MockLocationProvider::instance_ = NULL;
diff --git a/content/browser/loader/redirect_to_file_resource_handler.cc b/content/browser/loader/redirect_to_file_resource_handler.cc
index 41168c5..02be739 100644
--- a/content/browser/loader/redirect_to_file_resource_handler.cc
+++ b/content/browser/loader/redirect_to_file_resource_handler.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/files/file_util_proxy.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/threading/thread_restrictions.h"
#include "content/browser/loader/resource_dispatcher_host_impl.h"
diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc
index 120ab55..473e262 100644
--- a/content/browser/plugin_loader_posix.cc
+++ b/content/browser/plugin_loader_posix.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "content/common/child_process_host_impl.h"
#include "content/common/utility_messages.h"
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index a6400de..21a0a41 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/path_service.h"
#include "base/string_util.h"
diff --git a/content/browser/power_save_blocker_x11.cc b/content/browser/power_save_blocker_x11.cc
index c7dba77..36ded00 100644
--- a/content/browser/power_save_blocker_x11.cc
+++ b/content/browser/power_save_blocker_x11.cc
@@ -21,7 +21,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#if defined(TOOLKIT_GTK)
#include "base/message_pump_gtk.h"
#else
diff --git a/content/browser/renderer_host/media/web_contents_audio_input_stream.cc b/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
index 37afa5f..d1554a2 100644
--- a/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
+++ b/content/browser/renderer_host/media/web_contents_audio_input_stream.cc
@@ -10,7 +10,7 @@
#include "base/bind_helpers.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/browser/browser_main_loop.h"
#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
#include "content/browser/renderer_host/media/web_contents_capture_util.h"
diff --git a/content/browser/renderer_host/media/web_contents_tracker.cc b/content/browser/renderer_host/media/web_contents_tracker.cc
index a13dc12..3a75080 100644
--- a/content/browser/renderer_host/media/web_contents_tracker.cc
+++ b/content/browser/renderer_host/media/web_contents_tracker.cc
@@ -4,7 +4,7 @@
#include "content/browser/renderer_host/media/web_contents_tracker.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
index 52be61a..cef0073 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
@@ -62,7 +62,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/sequenced_task_runner.h"
#include "base/stringprintf.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index c12d592..858d9631 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "content/browser/gpu/gpu_data_manager_impl.h"
diff --git a/content/browser/streams/stream.cc b/content/browser/streams/stream.cc
index 1c6c956..27244e1 100644
--- a/content/browser/streams/stream.cc
+++ b/content/browser/streams/stream.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/browser/streams/stream_handle_impl.h"
#include "content/browser/streams/stream_read_observer.h"
#include "content/browser/streams/stream_registry.h"
diff --git a/content/browser/streams/stream_handle_impl.h b/content/browser/streams/stream_handle_impl.h
index 31bfbee..aabd0cb 100644
--- a/content/browser/streams/stream_handle_impl.h
+++ b/content/browser/streams/stream_handle_impl.h
@@ -6,7 +6,7 @@
#define CONTENT_BROWSER_STREAMS_STREAM_HANDLE_IMPL_H_
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "content/public/browser/stream_handle.h"
diff --git a/content/child/indexed_db/indexed_db_message_filter.cc b/content/child/indexed_db/indexed_db_message_filter.cc
index 6c64a6d..a7a5ee6 100644
--- a/content/child/indexed_db/indexed_db_message_filter.cc
+++ b/content/child/indexed_db/indexed_db_message_filter.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/pickle.h"
#include "content/child/child_thread.h"
#include "content/child/indexed_db/indexed_db_dispatcher.h"
diff --git a/content/child/thread_safe_sender.cc b/content/child/thread_safe_sender.cc
index 65a95d5..44fc899 100644
--- a/content/child/thread_safe_sender.cc
+++ b/content/child/thread_safe_sender.cc
@@ -4,7 +4,7 @@
#include "content/child/thread_safe_sender.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/child/child_thread.h"
#include "ipc/ipc_sync_message_filter.h"
diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc
index a8de900..1a350a9 100644
--- a/content/common/gpu/client/gpu_channel_host.cc
+++ b/content/common/gpu/client/gpu_channel_host.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/debug/trace_event.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/posix/eintr_wrapper.h"
#include "base/threading/thread_restrictions.h"
#include "content/common/gpu/client/command_buffer_proxy_impl.h"
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index a3b27d8..b32bf4a 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -14,7 +14,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/debug/trace_event.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/process_util.h"
#include "base/rand_util.h"
#include "base/string_util.h"
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index 1bbf93b..80b384a 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -13,7 +13,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "build/build_config.h"
#include "content/common/gpu/gpu_memory_manager.h"
#include "ipc/ipc_listener.h"
diff --git a/content/common/gpu/media/exynos_video_decode_accelerator.cc b/content/common/gpu/media/exynos_video_decode_accelerator.cc
index 74e71ab..5e7ba8b 100644
--- a/content/common/gpu/media/exynos_video_decode_accelerator.cc
+++ b/content/common/gpu/media/exynos_video_decode_accelerator.cc
@@ -14,7 +14,7 @@
#include "base/bind.h"
#include "base/debug/trace_event.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/posix/eintr_wrapper.h"
#include "base/shared_memory.h"
#include "content/common/gpu/media/exynos_video_decode_accelerator.h"
diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h
index 6e2fc67..254e74b 100644
--- a/content/public/browser/browser_thread.h
+++ b/content/public/browser/browser_thread.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner_util.h"
#include "base/time.h"
#include "content/common/content_export.h"
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 6c0dee1..9856394 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -4,8 +4,8 @@
#include "content/public/test/mock_render_thread.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/process_util.h"
-#include "base/message_loop_proxy.h"
#include "content/common/view_messages.h"
#include "ipc/ipc_message_utils.h"
#include "ipc/ipc_sync_message.h"
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index 55af865..d49c7b8 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -5,7 +5,7 @@
#include "content/renderer/gpu/compositor_output_surface.h"
#include "base/command_line.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/compositor_frame_ack.h"
#include "cc/output/output_surface_client.h"
diff --git a/content/renderer/gpu/input_event_filter.cc b/content/renderer/gpu/input_event_filter.cc
index 8085cdb..ecf47a0 100644
--- a/content/renderer/gpu/input_event_filter.cc
+++ b/content/renderer/gpu/input_event_filter.cc
@@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/debug/trace_event.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/input_messages.h"
#include "content/renderer/gpu/input_event_filter.h"
diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc
index 2b78e2c..84a86de 100644
--- a/content/renderer/media/audio_input_message_filter.cc
+++ b/content/renderer/media/audio_input_message_filter.cc
@@ -5,7 +5,7 @@
#include "content/renderer/media/audio_input_message_filter.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/media/audio_messages.h"
#include "ipc/ipc_logging.h"
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc
index 4523f01..e56d612 100644
--- a/content/renderer/media/audio_message_filter.cc
+++ b/content/renderer/media/audio_message_filter.cc
@@ -5,7 +5,7 @@
#include "content/renderer/media/audio_message_filter.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/media/audio_messages.h"
#include "content/renderer/render_thread_impl.h"
#include "ipc/ipc_logging.h"
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index 93c8d1c..2317380 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -5,7 +5,7 @@
#include "content/renderer/media/media_stream_dispatcher.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/media/media_stream_messages.h"
#include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
#include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/media/peer_connection_handler_base.h b/content/renderer/media/peer_connection_handler_base.h
index d18237b..54f1673 100644
--- a/content/renderer/media/peer_connection_handler_base.h
+++ b/content/renderer/media/peer_connection_handler_base.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
diff --git a/content/renderer/media/render_media_log.cc b/content/renderer/media/render_media_log.cc
index 8e4de53..5515ecc 100644
--- a/content/renderer/media/render_media_log.cc
+++ b/content/renderer/media/render_media_log.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/view_messages.h"
#include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/media/rtc_video_capture_delegate.h b/content/renderer/media/rtc_video_capture_delegate.h
index d8c3198..0d6893e 100644
--- a/content/renderer/media/rtc_video_capture_delegate.h
+++ b/content/renderer/media/rtc_video_capture_delegate.h
@@ -6,7 +6,7 @@
#define CONTENT_RENDERER_MEDIA_RTC_VIDEO_CAPTURE_DELEGATE_H_
#include "base/callback.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/media/video_capture.h"
#include "content/renderer/media/video_capture_impl_manager.h"
#include "media/video/capture/video_capture.h"
diff --git a/content/renderer/media/rtc_video_decoder_bridge_tv.cc b/content/renderer/media/rtc_video_decoder_bridge_tv.cc
index 046a535..a0d281b 100644
--- a/content/renderer/media/rtc_video_decoder_bridge_tv.cc
+++ b/content/renderer/media/rtc_video_decoder_bridge_tv.cc
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "content/renderer/media/rtc_video_decoder_factory_tv.h"
#include "media/base/bind_to_loop.h"
diff --git a/content/renderer/media/rtc_video_renderer.cc b/content/renderer/media/rtc_video_renderer.cc
index 6ec3db7f..725a778 100644
--- a/content/renderer/media/rtc_video_renderer.cc
+++ b/content/renderer/media/rtc_video_renderer.cc
@@ -8,7 +8,7 @@
#include "base/debug/trace_event.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
#include "third_party/libjingle/source/talk/media/base/videoframe.h"
diff --git a/content/renderer/media/stream_texture_factory_impl_android.cc b/content/renderer/media/stream_texture_factory_impl_android.cc
index 28af04c..80ad606 100644
--- a/content/renderer/media/stream_texture_factory_impl_android.cc
+++ b/content/renderer/media/stream_texture_factory_impl_android.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "content/common/android/surface_texture_peer.h"
#include "content/common/gpu/client/gpu_channel_host.h"
diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h
index d22b017..e942201 100644
--- a/content/renderer/media/video_capture_impl_manager.h
+++ b/content/renderer/media/video_capture_impl_manager.h
@@ -13,8 +13,8 @@
#include <list>
#include <map>
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread.h"
-#include "base/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
#include "media/video/capture/video_capture.h"
diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h
index 1418208..3499540 100644
--- a/content/renderer/media/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -12,7 +12,7 @@
#include <map>
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/shared_memory.h"
#include "content/common/content_export.h"
#include "content/common/media/video_capture.h"
diff --git a/content/renderer/media/webrtc_local_audio_renderer.cc b/content/renderer/media/webrtc_local_audio_renderer.cc
index 47dcb2e..c5ca67b 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.cc
+++ b/content/renderer/media/webrtc_local_audio_renderer.cc
@@ -6,7 +6,7 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/webrtc_audio_capturer.h"
diff --git a/content/renderer/p2p/host_address_request.cc b/content/renderer/p2p/host_address_request.cc
index 676361b..d0fd6d9 100644
--- a/content/renderer/p2p/host_address_request.cc
+++ b/content/renderer/p2p/host_address_request.cc
@@ -5,7 +5,7 @@
#include "content/renderer/p2p/host_address_request.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/p2p_messages.h"
#include "content/renderer/p2p/socket_dispatcher.h"
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 4267a3d..bbc87e1 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/debug/trace_event.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/renderer/p2p/socket_client.h"
#include "content/renderer/p2p/socket_dispatcher.h"
#include "jingle/glue/utils.h"
diff --git a/content/renderer/p2p/socket_client.cc b/content/renderer/p2p/socket_client.cc
index 490ebee..68797db 100644
--- a/content/renderer/p2p/socket_client.cc
+++ b/content/renderer/p2p/socket_client.cc
@@ -5,7 +5,7 @@
#include "content/renderer/p2p/socket_client.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/common/p2p_messages.h"
#include "content/renderer/p2p/socket_dispatcher.h"
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index e0812ce..d7fcf1d 100644
--- a/content/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/child/child_process.h"
#include "content/common/p2p_messages.h"
#include "content/renderer/p2p/host_address_request.h"
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h
index 7cbecf0..9f8bad3 100644
--- a/content/renderer/pepper/pepper_hung_plugin_filter.h
+++ b/content/renderer/pepper/pepper_hung_plugin_filter.h
@@ -7,7 +7,7 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "ipc/ipc_channel_proxy.h"
#include "ipc/ipc_sync_message_filter.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
index 1a3398e..9f46ae9 100644
--- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "build/build_config.h"
#include "content/child/child_process.h"
#include "content/renderer/media/audio_input_message_filter.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
index 60b5d92..277fb18 100644
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "build/build_config.h"
#include "content/child/child_process.h"
#include "content/common/media/audio_messages.h"
diff --git a/content/renderer/pepper/pepper_platform_video_capture_impl.cc b/content/renderer/pepper/pepper_platform_video_capture_impl.cc
index 5135a11..598b567 100644
--- a/content/renderer/pepper/pepper_platform_video_capture_impl.cc
+++ b/content/renderer/pepper/pepper_platform_video_capture_impl.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
#include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 2374e0c..a13b78c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -17,7 +17,7 @@
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/path_service.h"
#include "base/process_util.h"
diff --git a/dbus/bus.cc b/dbus/bus.cc
index 3dbbedc..1ddeeb8 100644
--- a/dbus/bus.cc
+++ b/dbus/bus.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
diff --git a/google_apis/gaia/gaia_oauth_client.h b/google_apis/gaia/gaia_oauth_client.h
index 43e0c03..17d6dbd 100644
--- a/google_apis/gaia/gaia_oauth_client.h
+++ b/google_apis/gaia/gaia_oauth_client.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace net {
class URLRequestContextGetter;
diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc
index 6213d41..2c08e7e 100644
--- a/ipc/ipc_channel_nacl.cc
+++ b/ipc/ipc_channel_nacl.cc
@@ -12,7 +12,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/process_util.h"
#include "base/synchronization/lock.h"
#include "base/task_runner_util.h"
diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc
index cd0e72c..541d685 100644
--- a/ipc/ipc_sync_message_filter.cc
+++ b/ipc/ipc_sync_message_filter.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "ipc/ipc_sync_message.h"
diff --git a/jingle/notifier/listener/non_blocking_push_client.cc b/jingle/notifier/listener/non_blocking_push_client.cc
index 30b8452..277cf49 100644
--- a/jingle/notifier/listener/non_blocking_push_client.cc
+++ b/jingle/notifier/listener/non_blocking_push_client.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "jingle/notifier/listener/push_client_observer.h"
namespace notifier {
diff --git a/jingle/notifier/listener/xmpp_push_client.cc b/jingle/notifier/listener/xmpp_push_client.cc
index 322b185..82622ce 100644
--- a/jingle/notifier/listener/xmpp_push_client.cc
+++ b/jingle/notifier/listener/xmpp_push_client.cc
@@ -5,7 +5,7 @@
#include "jingle/notifier/listener/xmpp_push_client.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "jingle/notifier/base/notifier_options_util.h"
#include "jingle/notifier/listener/push_client_observer.h"
#include "jingle/notifier/listener/send_ping_task.h"
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index cdc555f..2a8f031 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
#include "media/audio/audio_output_dispatcher_impl.h"
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index a23c02b..d2b2a89 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -5,7 +5,7 @@
#include <string>
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/audio/audio_output_dispatcher_impl.h"
#include "media/audio/audio_output_proxy.h"
#include "media/audio/audio_output_resampler.h"
diff --git a/media/audio/fake_audio_consumer.cc b/media/audio/fake_audio_consumer.cc
index 95db9cd..e70a74a 100644
--- a/media/audio/fake_audio_consumer.cc
+++ b/media/audio/fake_audio_consumer.cc
@@ -8,7 +8,7 @@
#include "base/bind_helpers.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_bus.h"
namespace media {
diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
index 0691ec2..d1177ea 100644
--- a/media/audio/mac/audio_manager_mac.h
+++ b/media/audio/mac/audio_manager_mac.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/mac/aggregate_device_manager.h"
#include "media/audio/mac/audio_device_listener_mac.h"
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
index 173479e..60898bd 100644
--- a/media/audio/mock_audio_manager.cc
+++ b/media/audio/mock_audio_manager.cc
@@ -5,7 +5,7 @@
#include "media/audio/mock_audio_manager.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/audio/audio_parameters.h"
namespace media {
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
index aa69c5c..607d7d8 100644
--- a/media/audio/null_audio_sink.cc
+++ b/media/audio/null_audio_sink.cc
@@ -5,7 +5,7 @@
#include "media/audio/null_audio_sink.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/audio/fake_audio_consumer.h"
#include "media/base/audio_hash.h"
diff --git a/media/audio/scoped_loop_observer.h b/media/audio/scoped_loop_observer.h
index 47cf23c..fcee33e 100644
--- a/media/audio/scoped_loop_observer.h
+++ b/media/audio/scoped_loop_observer.h
@@ -7,7 +7,7 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace base {
class WaitableEvent;
diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc
index 7ad5a8c..b03bb83 100644
--- a/media/audio/virtual_audio_input_stream.cc
+++ b/media/audio/virtual_audio_input_stream.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/audio/virtual_audio_output_stream.h"
namespace media {
diff --git a/media/audio/virtual_audio_output_stream.cc b/media/audio/virtual_audio_output_stream.cc
index 254a70a..43c449b 100644
--- a/media/audio/virtual_audio_output_stream.cc
+++ b/media/audio/virtual_audio_output_stream.cc
@@ -4,7 +4,7 @@
#include "media/audio/virtual_audio_output_stream.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/audio/virtual_audio_input_stream.h"
namespace media {
diff --git a/media/audio/virtual_audio_output_stream_unittest.cc b/media/audio/virtual_audio_output_stream_unittest.cc
index 21f7fe4..fc2f2e0 100644
--- a/media/audio/virtual_audio_output_stream_unittest.cc
+++ b/media/audio/virtual_audio_output_stream_unittest.cc
@@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "media/audio/audio_manager.h"
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index cb46888..0ada084 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -8,7 +8,7 @@
#include "base/android/jni_string.h"
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "jni/MediaPlayerBridge_jni.h"
#include "jni/MediaPlayer_jni.h"
#include "media/base/android/media_player_manager.h"
diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc
index d64aac7..94cbfd1 100644
--- a/media/base/android/media_player_listener.cc
+++ b/media/base/android/media_player_listener.cc
@@ -7,7 +7,7 @@
#include "base/android/jni_android.h"
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/android/media_player_bridge.h"
// Auto generated jni class from MediaPlayerListener.java.
diff --git a/media/base/bind_to_loop.h b/media/base/bind_to_loop.h
index ac61b4b..f224adb 100644
--- a/media/base/bind_to_loop.h
+++ b/media/base/bind_to_loop.h
@@ -12,7 +12,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
// This is a helper utility for base::Bind()ing callbacks on to particular
// MessageLoops. A typical use is when |a| (of class |A|) wants to hand a
diff --git a/media/base/bind_to_loop.h.pump b/media/base/bind_to_loop.h.pump
index 1a1ae12..09ae518 100644
--- a/media/base/bind_to_loop.h.pump
+++ b/media/base/bind_to_loop.h.pump
@@ -17,7 +17,7 @@ $var MAX_ARITY = 7
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
// This is a helper utility for base::Bind()ing callbacks on to particular
// MessageLoops. A typical use is when |a| (of class |A|) wants to hand a
diff --git a/media/base/serial_runner.cc b/media/base/serial_runner.cc
index 9d6c6ed..62728fe 100644
--- a/media/base/serial_runner.cc
+++ b/media/base/serial_runner.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace media {
diff --git a/media/filters/audio_decoder_selector.cc b/media/filters/audio_decoder_selector.cc
index 1195ca1..5dbd5e3 100644
--- a/media/filters/audio_decoder_selector.cc
+++ b/media/filters/audio_decoder_selector.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/bind_to_loop.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc
index 61b190b..9afd550 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -12,7 +12,7 @@
#include "base/callback.h"
#include "base/callback_helpers.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "media/audio/audio_util.h"
#include "media/base/audio_splicer.h"
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index e079e93..13c11a1 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -11,7 +11,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/stream_parser_buffer.h"
#include "media/base/video_decoder_config.h"
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index d8aeff8..f908d9b 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -10,7 +10,7 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/bind_to_loop.h"
#include "media/base/buffers.h"
diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
index ad53d70..77d769f 100644
--- a/media/filters/decrypting_demuxer_stream.cc
+++ b/media/filters/decrypting_demuxer_stream.cc
@@ -8,7 +8,7 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/video_decoder_config.h"
#include "media/base/bind_to_loop.h"
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index ee632d1..d542e26 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -9,7 +9,7 @@
#include "base/debug/trace_event.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/bind_to_loop.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decryptor.h"
diff --git a/media/filters/fake_video_decoder.cc b/media/filters/fake_video_decoder.cc
index bd3d8a7..d5b9b41 100644
--- a/media/filters/fake_video_decoder.cc
+++ b/media/filters/fake_video_decoder.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/bind_to_loop.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index 6ec4483..f8cea38 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/audio_timestamp_helper.h"
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 1ab2bfe..5b83786 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -11,7 +11,7 @@
#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "media/base/bind_to_loop.h"
#include "media/base/decoder_buffer.h"
diff --git a/media/filters/opus_audio_decoder.cc b/media/filters/opus_audio_decoder.cc
index e725ee7..be003f1 100644
--- a/media/filters/opus_audio_decoder.cc
+++ b/media/filters/opus_audio_decoder.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/sys_byteorder.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/audio_timestamp_helper.h"
diff --git a/media/filters/video_decoder_selector.cc b/media/filters/video_decoder_selector.cc
index e776061..d62b295 100644
--- a/media/filters/video_decoder_selector.cc
+++ b/media/filters/video_decoder_selector.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/bind_to_loop.h"
#include "media/base/demuxer_stream.h"
#include "media/base/pipeline.h"
diff --git a/media/filters/video_frame_stream.cc b/media/filters/video_frame_stream.cc
index 6c15eeb..5c90727 100644
--- a/media/filters/video_frame_stream.cc
+++ b/media/filters/video_frame_stream.cc
@@ -8,7 +8,7 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/bind_to_loop.h"
#include "media/base/decoder_buffer.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
index 35f889b..acdcb14 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -9,7 +9,7 @@
#include "base/command_line.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "base/sys_byteorder.h"
#include "media/base/bind_to_loop.h"
diff --git a/media/video/capture/video_capture_proxy.cc b/media/video/capture/video_capture_proxy.cc
index 463d77f..eb8fd07 100644
--- a/media/video/capture/video_capture_proxy.cc
+++ b/media/video/capture/video_capture_proxy.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace {
diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h
index e8de0ab..5fbc9dc6 100644
--- a/net/base/directory_lister.h
+++ b/net/base/directory_lister.h
@@ -10,7 +10,7 @@
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/base/net_export.h"
namespace net {
diff --git a/net/base/file_stream.cc b/net/base/file_stream.cc
index 2ec5848..f7f2e60 100644
--- a/net/base/file_stream.cc
+++ b/net/base/file_stream.cc
@@ -5,7 +5,7 @@
#include "net/base/file_stream.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/threading/worker_pool.h"
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
index dc0e6b8..c288fb1 100644
--- a/net/base/file_stream_context.cc
+++ b/net/base/file_stream_context.cc
@@ -5,7 +5,7 @@
#include "net/base/file_stream_context.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/threading/worker_pool.h"
diff --git a/net/base/upload_file_element_reader_unittest.cc b/net/base/upload_file_element_reader_unittest.cc
index 783175f..bd0594c 100644
--- a/net/base/upload_file_element_reader_unittest.cc
+++ b/net/base/upload_file_element_reader_unittest.cc
@@ -6,7 +6,7 @@
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index 21bd117..7a233f7 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -54,7 +54,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
diff --git a/net/disk_cache/disk_cache_test_util.cc b/net/disk_cache/disk_cache_test_util.cc
index 70c8997..0a622dc 100644
--- a/net/disk_cache/disk_cache_test_util.cc
+++ b/net/disk_cache/disk_cache_test_util.cc
@@ -6,7 +6,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/path_service.h"
#include "net/base/net_errors.h"
#include "net/disk_cache/backend_impl.h"
diff --git a/net/disk_cache/flash/flash_entry_impl.cc b/net/disk_cache/flash/flash_entry_impl.cc
index 01224029..a0e785c 100644
--- a/net/disk_cache/flash/flash_entry_impl.cc
+++ b/net/disk_cache/flash/flash_entry_impl.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner_util.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/disk_cache/in_flight_backend_io.h b/net/disk_cache/in_flight_backend_io.h
index 09cfd3f..5767213 100644
--- a/net/disk_cache/in_flight_backend_io.h
+++ b/net/disk_cache/in_flight_backend_io.h
@@ -8,7 +8,7 @@
#include <list>
#include <string>
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
diff --git a/net/disk_cache/in_flight_io.h b/net/disk_cache/in_flight_io.h
index 2ba7517..2a33304 100644
--- a/net/disk_cache/in_flight_io.h
+++ b/net/disk_cache/in_flight_io.h
@@ -7,7 +7,7 @@
#include <set>
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc
index 0e83aa6..1179153 100644
--- a/net/disk_cache/simple/simple_backend_impl.cc
+++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -8,7 +8,7 @@
#include "base/callback.h"
#include "base/file_util.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/sys_info.h"
#include "base/threading/worker_pool.h"
diff --git a/net/disk_cache/simple/simple_entry_impl.cc b/net/disk_cache/simple/simple_entry_impl.cc
index 054180c..d792903 100644
--- a/net/disk_cache/simple/simple_entry_impl.cc
+++ b/net/disk_cache/simple/simple_entry_impl.cc
@@ -13,7 +13,7 @@
#include "base/callback.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/threading/worker_pool.h"
#include "base/time.h"
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 408c96f..c2e656a 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -21,7 +21,7 @@
#include "base/compiler_specific.h"
#include "base/debug/debugger.h"
#include "base/debug/stack_trace.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc
index 207ad5e..394721c 100644
--- a/net/dns/serial_worker.cc
+++ b/net/dns/serial_worker.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/worker_pool.h"
namespace net {
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index fcba80e..8b1f759 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -23,7 +23,7 @@
#include "base/hash_tables.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
#include "net/base/cache_type.h"
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
index 2b49b94..ce0c98c 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/strings/sys_string_conversions.h"
#include "base/threading/worker_pool.h"
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h
index e6d9cfd..331d8a6 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
#include "base/timer.h"
diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc
index 072c2b8..438cc66 100644
--- a/net/proxy/multi_threaded_proxy_resolver.cc
+++ b/net/proxy/multi_threaded_proxy_resolver.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
diff --git a/net/proxy/network_delegate_error_observer.cc b/net/proxy/network_delegate_error_observer.cc
index 015003b..8029141a 100644
--- a/net/proxy/network_delegate_error_observer.cc
+++ b/net/proxy/network_delegate_error_observer.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/base/net_errors.h"
#include "net/base/network_delegate.h"
diff --git a/net/proxy/network_delegate_error_observer_unittest.cc b/net/proxy/network_delegate_error_observer_unittest.cc
index a786a4c..881e4bf6 100644
--- a/net/proxy/network_delegate_error_observer_unittest.cc
+++ b/net/proxy/network_delegate_error_observer_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread.h"
#include "net/base/net_errors.h"
#include "net/base/network_delegate.h"
diff --git a/net/proxy/polling_proxy_config_service.cc b/net/proxy/polling_proxy_config_service.cc
index 5fa7b56..611ea59 100644
--- a/net/proxy/polling_proxy_config_service.cc
+++ b/net/proxy/polling_proxy_config_service.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/observer_list.h"
#include "base/synchronization/lock.h"
#include "base/threading/worker_pool.h"
diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc
index 706aa1d..bb8d027 100644
--- a/net/proxy/proxy_resolver_v8_tracing.cc
+++ b/net/proxy/proxy_resolver_v8_tracing.cc
@@ -5,7 +5,7 @@
#include "net/proxy/proxy_resolver_v8_tracing.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/stringprintf.h"
#include "base/synchronization/cancellation_flag.h"
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 62f7044..cebfaab 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_util.h"
#include "base/thread_task_runner_handle.h"
#include "base/values.h"
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 5b0ded2..b314b78 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -7,7 +7,7 @@
#include <set>
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/values.h"
diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc
index 86efad9..0ccbc16 100644
--- a/net/ssl/server_bound_cert_service.cc
+++ b/net/ssl/server_bound_cert_service.cc
@@ -15,7 +15,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
diff --git a/net/tools/dump_cache/simple_cache_dumper.cc b/net/tools/dump_cache/simple_cache_dumper.cc
index 65cb6f5..4e846cb 100644
--- a/net/tools/dump_cache/simple_cache_dumper.cc
+++ b/net/tools/dump_cache/simple_cache_dumper.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread.h"
#include "net/base/cache_type.h"
#include "net/base/io_buffer.h"
diff --git a/net/url_request/url_fetcher_impl.cc b/net/url_request/url_fetcher_impl.cc
index fd24d98..e8f9d32 100644
--- a/net/url_request/url_fetcher_impl.cc
+++ b/net/url_request/url_fetcher_impl.cc
@@ -5,7 +5,7 @@
#include "net/url_request/url_fetcher_impl.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/url_request/url_fetcher_core.h"
#include "net/url_request/url_fetcher_factory.h"
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index f142f1e..a359c00 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 158252f..6f4ee99 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -13,7 +13,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string16.h"
diff --git a/ppapi/host/resource_message_filter.cc b/ppapi/host/resource_message_filter.cc
index 9442ce0..dafae73 100644
--- a/ppapi/host/resource_message_filter.cc
+++ b/ppapi/host/resource_message_filter.cc
@@ -5,7 +5,7 @@
#include "ppapi/host/resource_message_filter.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner.h"
#include "ipc/ipc_message.h"
#include "ppapi/c/pp_errors.h"
diff --git a/ppapi/host/resource_message_filter_unittest.cc b/ppapi/host/resource_message_filter_unittest.cc
index 7087866..280ae07 100644
--- a/ppapi/host/resource_message_filter_unittest.cc
+++ b/ppapi/host/resource_message_filter_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "ipc/ipc_message.h"
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 2df72cc..86cc0b4 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/observer_list.h"
#include "base/process_util.h"
#include "base/run_loop.h"
diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc
index 63d465a..deaf0da 100644
--- a/ppapi/proxy/ppb_message_loop_proxy.cc
+++ b/ppapi/proxy/ppb_message_loop_proxy.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppb_message_loop.h"
#include "ppapi/proxy/plugin_dispatcher.h"
diff --git a/ppapi/shared_impl/ppapi_globals.cc b/ppapi/shared_impl/ppapi_globals.cc
index f5166c3..28ed2cf 100644
--- a/ppapi/shared_impl/ppapi_globals.cc
+++ b/ppapi/shared_impl/ppapi_globals.cc
@@ -6,7 +6,7 @@
#include "base/lazy_instance.h" // For testing purposes only.
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/threading/thread_local.h" // For testing purposes only.
namespace ppapi {
diff --git a/remoting/client/plugin/pepper_xmpp_proxy.cc b/remoting/client/plugin/pepper_xmpp_proxy.cc
index 08a8399..62f4ad0 100644
--- a/remoting/client/plugin/pepper_xmpp_proxy.cc
+++ b/remoting/client/plugin/pepper_xmpp_proxy.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace remoting {
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index fe754ed..82f0d6e 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/callback.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "build/build_config.h"
#include "remoting/base/constants.h"
#include "remoting/host/chromoting_host_context.h"
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index e780eda..0857e05 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -5,6 +5,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/message_loop_proxy.h"
#include "remoting/base/auto_thread_task_runner.h"
#include "remoting/host/audio_capturer.h"
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index 27cd910..cf282dd 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "remoting/base/capabilities.h"
#include "remoting/codec/audio_encoder.h"
#include "remoting/codec/audio_encoder_opus.h"
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index b1fb0d1..c78bea0 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/rand_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/stringize_macros.h"
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 92094bf..c3efec5 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -8,7 +8,7 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "remoting/base/constants.h"
#include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/host/host_mock_objects.cc b/remoting/host/host_mock_objects.cc
index ea1fabb..4bdd064 100644
--- a/remoting/host/host_mock_objects.cc
+++ b/remoting/host/host_mock_objects.cc
@@ -4,7 +4,7 @@
#include "remoting/host/host_mock_objects.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/single_thread_task_runner.h"
#include "net/base/ip_endpoint.h"
#include "remoting/base/auto_thread_task_runner.h"
diff --git a/remoting/host/log_to_server.cc b/remoting/host/log_to_server.cc
index 933b1a5..6799589 100644
--- a/remoting/host/log_to_server.cc
+++ b/remoting/host/log_to_server.cc
@@ -5,7 +5,7 @@
#include "remoting/host/log_to_server.h"
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "remoting/base/constants.h"
#include "remoting/host/host_status_monitor.h"
#include "remoting/host/server_log_entry.h"
diff --git a/remoting/host/log_to_server_unittest.cc b/remoting/host/log_to_server_unittest.cc
index 912b87b..1dd60cb 100644
--- a/remoting/host/log_to_server_unittest.cc
+++ b/remoting/host/log_to_server_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "remoting/host/host_status_monitor_fake.h"
#include "remoting/host/log_to_server.h"
#include "remoting/jingle_glue/mock_objects.h"
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 46e849a..a1fe21a 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -8,7 +8,7 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/remoting/host/policy_hack/policy_watcher_win.cc b/remoting/host/policy_hack/policy_watcher_win.cc
index 2150de3..6fb05d41 100644
--- a/remoting/host/policy_hack/policy_watcher_win.cc
+++ b/remoting/host/policy_hack/policy_watcher_win.cc
@@ -16,7 +16,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
diff --git a/remoting/host/url_request_context.cc b/remoting/host/url_request_context.cc
index 283a28b..c3240fe 100644
--- a/remoting/host/url_request_context.cc
+++ b/remoting/host/url_request_context.cc
@@ -4,7 +4,7 @@
#include "remoting/host/url_request_context.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/cert/cert_verifier.h"
#include "net/dns/host_resolver.h"
#include "net/http/http_auth_handler_factory.h"
diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc
index d16042b..b9ebb3b 100644
--- a/remoting/host/video_scheduler.cc
+++ b/remoting/host/video_scheduler.cc
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/sys_info.h"
#include "base/time.h"
diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc
index b261380..8bb918e 100644
--- a/remoting/protocol/client_control_dispatcher.cc
+++ b/remoting/protocol/client_control_dispatcher.cc
@@ -6,7 +6,7 @@
#include "base/bind_helpers.h"
#include "base/callback.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/constants.h"
#include "remoting/proto/control.pb.h"
diff --git a/remoting/protocol/client_event_dispatcher.cc b/remoting/protocol/client_event_dispatcher.cc
index afc481f..e66181f5e2 100644
--- a/remoting/protocol/client_event_dispatcher.cc
+++ b/remoting/protocol/client_event_dispatcher.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/client_event_dispatcher.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc
index c3a7816..dd32452 100644
--- a/remoting/protocol/connection_to_client.cc
+++ b/remoting/protocol/connection_to_client.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/base/io_buffer.h"
#include "remoting/protocol/clipboard_stub.h"
#include "remoting/protocol/host_control_dispatcher.h"
diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc
index be215e8..81e016e 100644
--- a/remoting/protocol/connection_to_client_unittest.cc
+++ b/remoting/protocol/connection_to_client_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/fake_session.h"
#include "remoting/protocol/protocol_mock_objects.h"
diff --git a/remoting/protocol/host_control_dispatcher.cc b/remoting/protocol/host_control_dispatcher.cc
index 0c44cc2..b979e36 100644
--- a/remoting/protocol/host_control_dispatcher.cc
+++ b/remoting/protocol/host_control_dispatcher.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/host_control_dispatcher.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/constants.h"
#include "remoting/proto/control.pb.h"
diff --git a/remoting/protocol/protocol_mock_objects.cc b/remoting/protocol/protocol_mock_objects.cc
index 58f912b..072cf3c 100644
--- a/remoting/protocol/protocol_mock_objects.cc
+++ b/remoting/protocol/protocol_mock_objects.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/protocol_mock_objects.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/base/ip_endpoint.h"
#include "remoting/protocol/transport.h"
diff --git a/sync/internal_api/http_bridge.cc b/sync/internal_api/http_bridge.cc
index d429903..8a783e7 100644
--- a/sync/internal_api/http_bridge.cc
+++ b/sync/internal_api/http_bridge.cc
@@ -5,7 +5,7 @@
#include "sync/internal_api/public/http_bridge.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc
index 6db061e..c72f479 100644
--- a/sync/internal_api/http_bridge_unittest.cc
+++ b/sync/internal_api/http_bridge_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/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
diff --git a/sync/internal_api/public/util/weak_handle.cc b/sync/internal_api/public/util/weak_handle.cc
index e6411ee..0ed142e 100644
--- a/sync/internal_api/public/util/weak_handle.cc
+++ b/sync/internal_api/public/util/weak_handle.cc
@@ -8,7 +8,7 @@
#include "base/callback.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace syncer {
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index e0de2e4..36e0f12 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -17,7 +17,7 @@
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index 695705c..d097560 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "google/cacheinvalidation/include/invalidation-client-factory.h"
#include "jingle/notifier/listener/push_client.h"
diff --git a/ui/gl/android/surface_texture_listener.cc b/ui/gl/android/surface_texture_listener.cc
index ad908de..0547720 100644
--- a/ui/gl/android/surface_texture_listener.cc
+++ b/ui/gl/android/surface_texture_listener.cc
@@ -6,7 +6,7 @@
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "jni/SurfaceTextureListener_jni.h"
#include "ui/gl/android/surface_texture_bridge.h"
diff --git a/webkit/browser/appcache/appcache_quota_client_unittest.cc b/webkit/browser/appcache/appcache_quota_client_unittest.cc
index d9d429d..b45d2f3 100644
--- a/webkit/browser/appcache/appcache_quota_client_unittest.cc
+++ b/webkit/browser/appcache/appcache_quota_client_unittest.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/appcache/appcache_quota_client.h"
diff --git a/webkit/browser/appcache/appcache_storage_impl.h b/webkit/browser/appcache/appcache_storage_impl.h
index f92b718..e4f7466 100644
--- a/webkit/browser/appcache/appcache_storage_impl.h
+++ b/webkit/browser/appcache/appcache_storage_impl.h
@@ -14,7 +14,7 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "webkit/browser/appcache/appcache_database.h"
#include "webkit/browser/appcache/appcache_disk_cache.h"
#include "webkit/browser/appcache/appcache_storage.h"
diff --git a/webkit/browser/blob/blob_storage_context.cc b/webkit/browser/blob/blob_storage_context.cc
index 03acc8b..89f75af 100644
--- a/webkit/browser/blob/blob_storage_context.cc
+++ b/webkit/browser/blob/blob_storage_context.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "googleurl/src/gurl.h"
#include "webkit/browser/blob/blob_data_handle.h"
#include "webkit/common/blob/blob_data.h"
diff --git a/webkit/browser/blob/blob_url_request_job.cc b/webkit/browser/blob/blob_url_request_job.cc
index aaf38e7..51a3f9d 100644
--- a/webkit/browser/blob/blob_url_request_job.cc
+++ b/webkit/browser/blob/blob_url_request_job.cc
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/files/file_util_proxy.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/io_buffer.h"
diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/webkit/browser/blob/blob_url_request_job_factory.cc
index d30049a..cc600d1 100644
--- a/webkit/browser/blob/blob_url_request_job_factory.cc
+++ b/webkit/browser/blob/blob_url_request_job_factory.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_job_factory.h"
#include "webkit/browser/blob/blob_storage_controller.h"
diff --git a/webkit/browser/database/database_quota_client.cc b/webkit/browser/database/database_quota_client.cc
index 66c2c4d..e9138cc 100644
--- a/webkit/browser/database/database_quota_client.cc
+++ b/webkit/browser/database/database_quota_client.cc
@@ -10,7 +10,7 @@
#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/task_runner_util.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
diff --git a/webkit/browser/database/database_quota_client.h b/webkit/browser/database/database_quota_client.h
index 69ba10d..0239b5d 100644
--- a/webkit/browser/database/database_quota_client.h
+++ b/webkit/browser/database/database_quota_client.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "webkit/browser/quota/quota_client.h"
#include "webkit/common/quota/quota_types.h"
#include "webkit/storage/webkit_storage_export.h"
diff --git a/webkit/browser/database/database_quota_client_unittest.cc b/webkit/browser/database/database_quota_client_unittest.cc
index ddb7aef..4fb4a4c 100644
--- a/webkit/browser/database/database_quota_client_unittest.cc
+++ b/webkit/browser/database/database_quota_client_unittest.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index c18fe00..bf1890d 100644
--- a/webkit/browser/database/database_tracker.cc
+++ b/webkit/browser/database/database_tracker.cc
@@ -11,7 +11,7 @@
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_enumerator.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc
index c9abd12..9cdaf97 100644
--- a/webkit/browser/database/database_tracker_unittest.cc
+++ b/webkit/browser/database/database_tracker_unittest.cc
@@ -7,7 +7,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
diff --git a/webkit/browser/dom_storage/dom_storage_area_unittest.cc b/webkit/browser/dom_storage/dom_storage_area_unittest.cc
index 05b6bbf..56afcf1 100644
--- a/webkit/browser/dom_storage/dom_storage_area_unittest.cc
+++ b/webkit/browser/dom_storage/dom_storage_area_unittest.cc
@@ -6,7 +6,7 @@
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time.h"
diff --git a/webkit/browser/dom_storage/dom_storage_context_unittest.cc b/webkit/browser/dom_storage/dom_storage_context_unittest.cc
index 002a62b..17af914 100644
--- a/webkit/browser/dom_storage/dom_storage_context_unittest.cc
+++ b/webkit/browser/dom_storage/dom_storage_context_unittest.cc
@@ -6,7 +6,7 @@
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time.h"
diff --git a/webkit/browser/dom_storage/dom_storage_task_runner.cc b/webkit/browser/dom_storage/dom_storage_task_runner.cc
index 57f61d6..e1cc2f4 100644
--- a/webkit/browser/dom_storage/dom_storage_task_runner.cc
+++ b/webkit/browser/dom_storage/dom_storage_task_runner.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/tracked_objects.h"
namespace dom_storage {
diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job.h b/webkit/browser/fileapi/file_system_dir_url_request_job.h
index 4b574d1..fd7dfd3 100644
--- a/webkit/browser/fileapi/file_system_dir_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job.h
@@ -10,7 +10,7 @@
#include "base/files/file_path.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "net/url_request/url_request_job.h"
#include "webkit/browser/fileapi/file_system_url.h"
diff --git a/webkit/browser/fileapi/file_system_quota_client_unittest.cc b/webkit/browser/fileapi/file_system_quota_client_unittest.cc
index 5e69a1a..01b8e6d 100644
--- a/webkit/browser/fileapi/file_system_quota_client_unittest.cc
+++ b/webkit/browser/fileapi/file_system_quota_client_unittest.cc
@@ -7,7 +7,7 @@
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webkit/browser/fileapi/file_system_task_runners.cc b/webkit/browser/fileapi/file_system_task_runners.cc
index 59d0abd..19d81c5 100644
--- a/webkit/browser/fileapi/file_system_task_runners.cc
+++ b/webkit/browser/fileapi/file_system_task_runners.cc
@@ -4,7 +4,7 @@
#include "webkit/browser/fileapi/file_system_task_runners.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/single_thread_task_runner.h"
namespace fileapi {
diff --git a/webkit/browser/fileapi/file_system_url_request_job.cc b/webkit/browser/fileapi/file_system_url_request_job.cc
index 617f980..34f8661 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job.cc
@@ -11,7 +11,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util_proxy.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/threading/thread_restrictions.h"
#include "base/time.h"
diff --git a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
index abf497e..70a12af 100644
--- a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -13,7 +13,7 @@
#include "base/format_macros.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/rand_util.h"
#include "base/stringprintf.h"
diff --git a/webkit/browser/fileapi/file_writer_delegate.cc b/webkit/browser/fileapi/file_writer_delegate.cc
index 1d307e0..18bead3 100644
--- a/webkit/browser/fileapi/file_writer_delegate.cc
+++ b/webkit/browser/fileapi/file_writer_delegate.cc
@@ -8,7 +8,7 @@
#include "base/callback.h"
#include "base/files/file_util_proxy.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/sequenced_task_runner.h"
#include "base/threading/thread_restrictions.h"
#include "net/base/net_errors.h"
diff --git a/webkit/browser/fileapi/isolated_file_util_unittest.cc b/webkit/browser/fileapi/isolated_file_util_unittest.cc
index 4fb8432..26fd11c 100644
--- a/webkit/browser/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/browser/fileapi/isolated_file_util_unittest.cc
@@ -13,7 +13,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/fileapi/async_file_test_helper.h"
diff --git a/webkit/browser/fileapi/isolated_mount_point_provider.cc b/webkit/browser/fileapi/isolated_mount_point_provider.cc
index b4e501f..b1c46c4 100644
--- a/webkit/browser/fileapi/isolated_mount_point_provider.cc
+++ b/webkit/browser/fileapi/isolated_mount_point_provider.cc
@@ -10,7 +10,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util_proxy.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/sequenced_task_runner.h"
#include "webkit/browser/blob/local_file_stream_reader.h"
diff --git a/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc b/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc
index e6eda67..ab8b4bf 100644
--- a/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc
+++ b/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
diff --git a/webkit/browser/fileapi/local_file_util_unittest.cc b/webkit/browser/fileapi/local_file_util_unittest.cc
index 36f0b4e..1eb3792 100644
--- a/webkit/browser/fileapi/local_file_util_unittest.cc
+++ b/webkit/browser/fileapi/local_file_util_unittest.cc
@@ -8,7 +8,7 @@
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/webkit/browser/fileapi/sandbox_file_system_test_helper.cc b/webkit/browser/fileapi/sandbox_file_system_test_helper.cc
index cc31b19..85e909c 100644
--- a/webkit/browser/fileapi/sandbox_file_system_test_helper.cc
+++ b/webkit/browser/fileapi/sandbox_file_system_test_helper.cc
@@ -6,7 +6,7 @@
#include "base/file_util.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "googleurl/src/gurl.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_file_util.h"
diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc
index 00e8d75..50ea2d4 100644
--- a/webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc
@@ -11,7 +11,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/fileapi/file_system_mount_point_provider.h"
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index e8d1181..ef99628 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/file_util.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/task_runner_util.h"
diff --git a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
index 7abd54c..0d3e2e9 100644
--- a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
@@ -11,7 +11,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/blob/mock_blob_url_request_context.h"
diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc
index c7ed4a0..e0c2b7d 100644
--- a/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_util_unittest.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
diff --git a/webkit/browser/quota/mock_quota_manager_unittest.cc b/webkit/browser/quota/mock_quota_manager_unittest.cc
index c9d3e9e..41d9aa7 100644
--- a/webkit/browser/quota/mock_quota_manager_unittest.cc
+++ b/webkit/browser/quota/mock_quota_manager_unittest.cc
@@ -10,7 +10,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/quota/mock_quota_manager.h"
#include "webkit/browser/quota/mock_special_storage_policy.h"
diff --git a/webkit/browser/quota/mock_storage_client.cc b/webkit/browser/quota/mock_storage_client.cc
index c0d03c4..7e25654 100644
--- a/webkit/browser/quota/mock_storage_client.cc
+++ b/webkit/browser/quota/mock_storage_client.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "net/base/net_util.h"
#include "webkit/browser/quota/quota_manager.h"
diff --git a/webkit/browser/quota/quota_manager_unittest.cc b/webkit/browser/quota/quota_manager_unittest.cc
index 987a098..809fb23 100644
--- a/webkit/browser/quota/quota_manager_unittest.cc
+++ b/webkit/browser/quota/quota_manager_unittest.cc
@@ -12,7 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/sys_info.h"
#include "base/time.h"
diff --git a/webkit/browser/quota/quota_task.cc b/webkit/browser/quota/quota_task.cc
index 95b02f1..cb8a124 100644
--- a/webkit/browser/quota/quota_task.cc
+++ b/webkit/browser/quota/quota_task.cc
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/single_thread_task_runner.h"
using base::TaskRunner;
diff --git a/webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc b/webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc
index 59acd79..6f67116 100644
--- a/webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc
+++ b/webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/browser/quota/mock_storage_client.h"
#include "webkit/browser/quota/quota_manager.h"
diff --git a/webkit/browser/quota/usage_tracker.cc b/webkit/browser/quota/usage_tracker.cc
index 6f9f135..4bf6488 100644
--- a/webkit/browser/quota/usage_tracker.cc
+++ b/webkit/browser/quota/usage_tracker.cc
@@ -11,7 +11,7 @@
#include <vector>
#include "base/bind.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "net/base/net_util.h"
diff --git a/webkit/common/blob/shareable_file_reference_unittest.cc b/webkit/common/blob/shareable_file_reference_unittest.cc
index 3ee2cd8..14ab668 100644
--- a/webkit/common/blob/shareable_file_reference_unittest.cc
+++ b/webkit/common/blob/shareable_file_reference_unittest.cc
@@ -7,7 +7,7 @@
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace webkit_blob {
diff --git a/webkit/common/database/database_connections.cc b/webkit/common/database/database_connections.cc
index 56db388..ab091e8 100644
--- a/webkit/common/database/database_connections.cc
+++ b/webkit/common/database/database_connections.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
namespace webkit_database {
diff --git a/webkit/glue/resource_request_body_unittest.cc b/webkit/glue/resource_request_body_unittest.cc
index 7577a26..3c107fa 100644
--- a/webkit/glue/resource_request_body_unittest.cc
+++ b/webkit/glue/resource_request_body_unittest.cc
@@ -9,7 +9,7 @@
#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "googleurl/src/gurl.h"
#include "net/base/upload_bytes_element_reader.h"
diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.cc b/webkit/plugins/ppapi/content_decryptor_delegate.cc
index 4c711e6..35d3d92 100644
--- a/webkit/plugins/ppapi/content_decryptor_delegate.cc
+++ b/webkit/plugins/ppapi/content_decryptor_delegate.cc
@@ -6,7 +6,7 @@
#include "base/callback_helpers.h"
#include "base/debug/trace_event.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/bind_to_loop.h"
#include "media/base/channel_layout.h"
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc
index 023edc7..2fa4140 100644
--- a/webkit/plugins/ppapi/mock_plugin_delegate.cc
+++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc
@@ -5,7 +5,7 @@
#include "webkit/plugins/ppapi/mock_plugin_delegate.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/shared_impl/ppapi_preferences.h"
#include "third_party/WebKit/public/platform/WebGamepads.h"
diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h
index 9624e80..06962e0 100644
--- a/webkit/plugins/ppapi/plugin_delegate.h
+++ b/webkit/plugins/ppapi/plugin_delegate.h
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/process.h"
#include "base/shared_memory.h"
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 9f7bad1..6bbac1c 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/time.h"
#include "ppapi/c/dev/ppb_audio_input_dev.h"
#include "ppapi/c/dev/ppb_buffer_dev.h"
diff --git a/webkit/plugins/ppapi/quota_file_io.cc b/webkit/plugins/ppapi/quota_file_io.cc
index df4283b..a86dc04 100644
--- a/webkit/plugins/ppapi/quota_file_io.cc
+++ b/webkit/plugins/ppapi/quota_file_io.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/stl_util.h"
#include "base/task_runner_util.h"
#include "webkit/plugins/ppapi/host_globals.h"
diff --git a/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc b/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc
index 5eadb1f..d8a4fb6 100644
--- a/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc
@@ -5,7 +5,7 @@
#include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "cc/animation/transform_operations.h"
#include "cc/base/thread_impl.h"
#include "cc/output/output_surface.h"
diff --git a/webkit/renderer/compositor_bindings/web_compositor_support_impl.h b/webkit/renderer/compositor_bindings/web_compositor_support_impl.h
index 8048c94..9d7f859 100644
--- a/webkit/renderer/compositor_bindings/web_compositor_support_impl.h
+++ b/webkit/renderer/compositor_bindings/web_compositor_support_impl.h
@@ -6,7 +6,7 @@
#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_IMPL_H_
#include "base/memory/ref_counted.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "third_party/WebKit/public/platform/WebCompositorSupport.h"
#include "third_party/WebKit/public/platform/WebLayer.h"
#include "third_party/WebKit/public/platform/WebTransformOperations.h"
diff --git a/webkit/renderer/media/android/media_source_delegate.cc b/webkit/renderer/media/android/media_source_delegate.cc
index 995f303..bfb54bb 100644
--- a/webkit/renderer/media/android/media_source_delegate.cc
+++ b/webkit/renderer/media/android/media_source_delegate.cc
@@ -4,7 +4,7 @@
#include "webkit/renderer/media/android/media_source_delegate.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/string_number_conversions.h"
#include "media/base/android/demuxer_stream_player_params.h"
#include "media/base/bind_to_loop.h"
diff --git a/webkit/renderer/media/buffered_data_source.cc b/webkit/renderer/media/buffered_data_source.cc
index 2fc1528..9644d1f 100644
--- a/webkit/renderer/media/buffered_data_source.cc
+++ b/webkit/renderer/media/buffered_data_source.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/media_log.h"
#include "net/base/net_errors.h"
diff --git a/webkit/renderer/media/crypto/ppapi_decryptor.cc b/webkit/renderer/media/crypto/ppapi_decryptor.cc
index ab79b76..341f8d3 100644
--- a/webkit/renderer/media/crypto/ppapi_decryptor.cc
+++ b/webkit/renderer/media/crypto/ppapi_decryptor.cc
@@ -11,7 +11,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/data_buffer.h"
#include "media/base/decoder_buffer.h"
diff --git a/webkit/renderer/media/simple_video_frame_provider.cc b/webkit/renderer/media/simple_video_frame_provider.cc
index 3051e18..1bc2323 100644
--- a/webkit/renderer/media/simple_video_frame_provider.cc
+++ b/webkit/renderer/media/simple_video_frame_provider.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/location.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/video_frame.h"
namespace webkit_media {
diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc
index 87af6af..acd54ea 100644
--- a/webkit/renderer/media/webmediaplayer_impl.cc
+++ b/webkit/renderer/media/webmediaplayer_impl.cc
@@ -13,7 +13,7 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/debug/crash_logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/waitable_event.h"
diff --git a/webkit/renderer/media/webmediaplayer_params.cc b/webkit/renderer/media/webmediaplayer_params.cc
index 91769d8..af7b704 100644
--- a/webkit/renderer/media/webmediaplayer_params.cc
+++ b/webkit/renderer/media/webmediaplayer_params.cc
@@ -4,7 +4,7 @@
#include "webkit/renderer/media/webmediaplayer_params.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "media/base/audio_renderer_sink.h"
#include "media/base/media_log.h"
diff --git a/webkit/support/simple_database_system.cc b/webkit/support/simple_database_system.cc
index 0855c48..9bd7429 100644
--- a/webkit/support/simple_database_system.cc
+++ b/webkit/support/simple_database_system.cc
@@ -9,7 +9,7 @@
#include "base/bind_helpers.h"
#include "base/file_util.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
diff --git a/webkit/support/simple_file_system.cc b/webkit/support/simple_file_system.cc
index b2aa728..07d79c6 100644
--- a/webkit/support/simple_file_system.cc
+++ b/webkit/support/simple_file_system.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "googleurl/src/gurl.h"
diff --git a/webkit/support/simple_file_writer.cc b/webkit/support/simple_file_writer.cc
index 98de70b..fc478f5 100644
--- a/webkit/support/simple_file_writer.cc
+++ b/webkit/support/simple_file_writer.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/url_request/url_request_context.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation_runner.h"
diff --git a/webkit/support/simple_resource_loader_bridge.cc b/webkit/support/simple_resource_loader_bridge.cc
index 5e8462c..49410cf 100644
--- a/webkit/support/simple_resource_loader_bridge.cc
+++ b/webkit/support/simple_resource_loader_bridge.cc
@@ -39,7 +39,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "base/string_util.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
diff --git a/webkit/support/simple_resource_loader_bridge.h b/webkit/support/simple_resource_loader_bridge.h
index ea73ee7..0e2372f9 100644
--- a/webkit/support/simple_resource_loader_bridge.h
+++ b/webkit/support/simple_resource_loader_bridge.h
@@ -6,7 +6,7 @@
#define WEBKIT_SUPPORT_SIMPLE_RESOURCE_LOADER_BRIDGE_H__
#include <string>
-#include "base/message_loop_proxy.h"
+#include "base/message_loop/message_loop_proxy.h"
#include "net/http/http_cache.h"
#include "webkit/glue/resource_loader_bridge.h"