diff options
60 files changed, 61 insertions, 61 deletions
diff --git a/content/common/browser_rendering_stats.h b/content/common/browser_rendering_stats.h index 8fc53fc..ce20158 100644 --- a/content/common/browser_rendering_stats.h +++ b/content/common/browser_rendering_stats.h @@ -5,7 +5,7 @@ #ifndef CONTENT_COMMON_BROWSER_RENDERING_STATS_H_ #define CONTENT_COMMON_BROWSER_RENDERING_STATS_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/rendering_stats.h" #include "content/common/content_export.h" diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc index 2ce57d9..4bfd440 100644 --- a/content/common/gpu/client/gl_helper.cc +++ b/content/common/gpu/client/gl_helper.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/resources/sync_point_helper.h" #include "content/common/gpu/client/gl_helper_scaling.h" #include "media/base/video_frame.h" diff --git a/content/common/gpu/client/gl_helper_benchmark.cc b/content/common/gpu/client/gl_helper_benchmark.cc index 193e836..02bcad75e 100644 --- a/content/common/gpu/client/gl_helper_benchmark.cc +++ b/content/common/gpu/client/gl_helper_benchmark.cc @@ -21,7 +21,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/gpu/client/gl_helper.h" #include "content/common/gpu/client/gl_helper_scaling.h" #include "content/public/test/unittest_test_suite.h" diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc index c859fbc..6b02372 100644 --- a/content/common/gpu/client/gl_helper_scaling.cc +++ b/content/common/gpu/client/gl_helper_scaling.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/rect.h" diff --git a/content/common/gpu/client/gl_helper_unittests.cc b/content/common/gpu/client/gl_helper_unittests.cc index 847a0cb..dc2f855 100644 --- a/content/common/gpu/client/gl_helper_unittests.cc +++ b/content/common/gpu/client/gl_helper_unittests.cc @@ -18,7 +18,7 @@ #include "base/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/gpu/client/gl_helper.h" #include "content/common/gpu/client/gl_helper_scaling.h" #include "content/public/test/unittest_test_suite.h" diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index e8cb102..e89e4a1 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -18,7 +18,7 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/strings/string_util.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/gpu/sync_point_manager.h" diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index d6706af..abfa92f 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -8,7 +8,7 @@ #include "base/debug/trace_event.h" #include "base/hash.h" #include "base/shared_memory.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_channel_manager.h" diff --git a/content/common/gpu/gpu_rendering_stats.h b/content/common/gpu/gpu_rendering_stats.h index 7b87f4e..f91e881 100644 --- a/content/common/gpu/gpu_rendering_stats.h +++ b/content/common/gpu/gpu_rendering_stats.h @@ -5,7 +5,7 @@ #ifndef CONTENT_COMMON_GPU_GPU_RENDERING_STATS_H_ #define CONTENT_COMMON_GPU_GPU_RENDERING_STATS_H_ -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/rendering_stats.h" #include "content/common/content_export.h" diff --git a/content/common/inter_process_time_ticks_converter.h b/content/common/inter_process_time_ticks_converter.h index d1d405f..01c6124 100644 --- a/content/common/inter_process_time_ticks_converter.h +++ b/content/common/inter_process_time_ticks_converter.h @@ -5,7 +5,7 @@ #ifndef CONTENT_COMMON_INTER_PROCESS_TIME_TICKS_CONVERTER_H_ #define CONTENT_COMMON_INTER_PROCESS_TIME_TICKS_CONVERTER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace content { diff --git a/content/common/inter_process_time_ticks_converter_unittest.cc b/content/common/inter_process_time_ticks_converter_unittest.cc index 84db29d..a651bfb 100644 --- a/content/common/inter_process_time_ticks_converter_unittest.cc +++ b/content/common/inter_process_time_ticks_converter_unittest.cc @@ -4,7 +4,7 @@ #include "content/common/inter_process_time_ticks_converter.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeTicks; diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h index ce60970..c039ea0 100644 --- a/content/common/media/media_player_messages_android.h +++ b/content/common/media/media_player_messages_android.h @@ -7,7 +7,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc index 523e29d..6069792 100644 --- a/content/common/sandbox_linux.cc +++ b/content/common/sandbox_linux.cc @@ -16,7 +16,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/posix/eintr_wrapper.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/sandbox_linux.h" #include "content/common/sandbox_seccomp_bpf_linux.h" #include "content/public/common/content_switches.h" diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h index 8bd9f58..ff0c925 100644 --- a/content/gpu/gpu_child_thread.h +++ b/content/gpu/gpu_child_thread.h @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/child/child_thread.h" #include "content/common/gpu/gpu_channel.h" diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h index 22cc887..1860498 100644 --- a/content/gpu/gpu_watchdog_thread.h +++ b/content/gpu/gpu_watchdog_thread.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/threading/thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/gpu/gpu_watchdog.h" namespace content { diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 8419e98..43e8a74 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/shared_memory.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" #include "skia/ext/refptr.h" diff --git a/content/port/browser/render_widget_host_view_frame_subscriber.h b/content/port/browser/render_widget_host_view_frame_subscriber.h index fb88860..c99624f 100644 --- a/content/port/browser/render_widget_host_view_frame_subscriber.h +++ b/content/port/browser/render_widget_host_view_frame_subscriber.h @@ -6,7 +6,7 @@ #define CONTENT_PORT_BROWSER_RENDER_WIDGET_HOST_VIEW_FRAME_SUBSCRIBER_H_ #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" namespace gfx { class Rect; diff --git a/content/port/browser/smooth_scroll_gesture.h b/content/port/browser/smooth_scroll_gesture.h index 4e2c1d9..d4682cc 100644 --- a/content/port/browser/smooth_scroll_gesture.h +++ b/content/port/browser/smooth_scroll_gesture.h @@ -6,7 +6,7 @@ #define CONTENT_PORT_BROWSER_SMOOTH_SCROLL_GESTURE_H_ #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" namespace content { diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 0bf65c2..c228bf6 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -15,7 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/child/child_process.h" #include "content/common/child_process_messages.h" #include "content/common/sandbox_util.h" diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h index 254e74b..c22f520 100644 --- a/content/public/browser/browser_thread.h +++ b/content/public/browser/browser_thread.h @@ -12,7 +12,7 @@ #include "base/location.h" #include "base/message_loop/message_loop_proxy.h" #include "base/task_runner_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #if defined(UNIT_TEST) diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index 590e774..f77cc1f 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h @@ -35,7 +35,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/sequenced_task_runner_helpers.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/download_id.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h index 10c0cab..3461eb5 100644 --- a/content/public/browser/download_manager_delegate.h +++ b/content/public/browser/download_manager_delegate.h @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_item.h" diff --git a/content/public/browser/histogram_fetcher.h b/content/public/browser/histogram_fetcher.h index 5e6e090..1cec991 100644 --- a/content/public/browser/histogram_fetcher.h +++ b/content/public/browser/histogram_fetcher.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace base { diff --git a/content/public/browser/indexed_db_info.h b/content/public/browser/indexed_db_info.h index 951c968..3572993 100644 --- a/content/public/browser/indexed_db_info.h +++ b/content/public/browser/indexed_db_info.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_BROWSER_INDEXED_DB_INFO_H_ #include "base/files/file_path.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" diff --git a/content/public/browser/load_notification_details.h b/content/public/browser/load_notification_details.h index 2f610fb..43c736c 100644 --- a/content/public/browser/load_notification_details.h +++ b/content/public/browser/load_notification_details.h @@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_LOAD_NOTIFICATION_DETAILS_H_ #define CONTENT_PUBLIC_BROWSER_LOAD_NOTIFICATION_DETAILS_H_ -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/navigation_controller.h" #include "content/public/common/page_transition_types.h" #include "googleurl/src/gurl.h" diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h index 362a014..e7724eb 100644 --- a/content/public/browser/navigation_entry.h +++ b/content/public/browser/navigation_entry.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/page_type.h" diff --git a/content/public/browser/plugin_data_remover.h b/content/public/browser/plugin_data_remover.h index 128b40d..6c39e3d 100644 --- a/content/public/browser/plugin_data_remover.h +++ b/content/public/browser/plugin_data_remover.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace base { diff --git a/content/public/common/geoposition.h b/content/public/common/geoposition.h index 1ea89f9..8cbee51 100644 --- a/content/public/common/geoposition.h +++ b/content/public/common/geoposition.h @@ -11,7 +11,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace content { diff --git a/content/public/common/password_form.h b/content/public/common/password_form.h index 4fced39..ac52f22 100644 --- a/content/public/common/password_form.h +++ b/content/public/common/password_form.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h index 93f6b8a..c7829d6 100644 --- a/content/public/renderer/document_state.h +++ b/content/public/renderer/document_state.h @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/supports_user_data.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "net/http/http_response_info.h" #include "third_party/WebKit/public/web/WebDataSource.h" diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h index 0fc56b4..d5e6339 100644 --- a/content/public/test/mock_download_item.h +++ b/content/public/test/mock_download_item.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_ITEM_H_ #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/download_id.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc index ad39a349..1a20910 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc @@ -6,7 +6,7 @@ #include "base/lazy_instance.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" diff --git a/content/public/test/nested_message_pump_android.cc b/content/public/test/nested_message_pump_android.cc index a0d418f..3325a5e 100644 --- a/content/public/test/nested_message_pump_android.cc +++ b/content/public/test/nested_message_pump_android.cc @@ -9,7 +9,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "jni/NestedSystemMessageHandler_jni.h" namespace { diff --git a/content/public/test/render_view_fake_resources_test.cc b/content/public/test/render_view_fake_resources_test.cc index 62d0457..5456add 100644 --- a/content/public/test/render_view_fake_resources_test.cc +++ b/content/public/test/render_view_fake_resources_test.cc @@ -10,7 +10,7 @@ #include "base/process.h" #include "base/run_loop.h" #include "base/shared_memory.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/resource_messages.h" #include "content/common/view_messages.h" #include "content/public/common/resource_response.h" diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 9d168cf..ae5abbd 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -22,7 +22,7 @@ #include "base/test/test_launcher.h" #include "base/test/test_suite.h" #include "base/test/test_timeouts.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/app/content_main.h" #include "content/public/app/content_main_delegate.h" #include "content/public/app/startup_helper_win.h" diff --git a/content/renderer/all_rendering_benchmarks.cc b/content/renderer/all_rendering_benchmarks.cc index 2c01a65..14280f3 100644 --- a/content/renderer/all_rendering_benchmarks.cc +++ b/content/renderer/all_rendering_benchmarks.cc @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/renderer/rendering_benchmark.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkPicture.h" diff --git a/content/renderer/dom_storage/webstoragearea_impl.cc b/content/renderer/dom_storage/webstoragearea_impl.cc index ecb1457..40df45a 100644 --- a/content/renderer/dom_storage/webstoragearea_impl.cc +++ b/content/renderer/dom_storage/webstoragearea_impl.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/dom_storage_messages.h" #include "content/renderer/dom_storage/dom_storage_dispatcher.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/fetchers/resource_fetcher.h b/content/renderer/fetchers/resource_fetcher.h index ba9512f2..13ef741 100644 --- a/content/renderer/fetchers/resource_fetcher.h +++ b/content/renderer/fetchers/resource_fetcher.h @@ -18,7 +18,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h index 422a5250..d7c2855 100644 --- a/content/renderer/gpu/compositor_output_surface.h +++ b/content/renderer/gpu/compositor_output_surface.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/output/begin_frame_args.h" #include "cc/output/output_surface.h" #include "ipc/ipc_sync_message_filter.h" diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index ca7a37f..06929e6 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/base/switches.h" #include "cc/debug/layer_tree_debug_state.h" #include "cc/layers/layer.h" diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h index 9f11b25..ba46f10 100644 --- a/content/renderer/gpu/render_widget_compositor.h +++ b/content/renderer/gpu/render_widget_compositor.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/debug/rendering_stats.h" #include "cc/input/top_controls_state.h" #include "cc/trees/layer_tree_host_client.h" diff --git a/content/renderer/load_progress_tracker.h b/content/renderer/load_progress_tracker.h index cfcd5a8..a239350 100644 --- a/content/renderer/load_progress_tracker.h +++ b/content/renderer/load_progress_tracker.h @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" namespace WebKit { class WebFrame; diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h index f5c62f4..842ae83 100644 --- a/content/renderer/media/android/media_info_loader.h +++ b/content/renderer/media/android/media_info_loader.h @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h index a91b306..a8df80b 100644 --- a/content/renderer/media/android/media_source_delegate.h +++ b/content/renderer/media/android/media_source_delegate.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "media/base/decryptor.h" #include "media/base/demuxer.h" #include "media/base/media_keys.h" diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index 31f4c9f..27b50bf 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "cc/layers/video_frame_provider.h" #include "content/renderer/media/android/media_info_loader.h" #include "content/renderer/media/android/media_source_delegate.h" diff --git a/content/renderer/media/android/webmediaplayer_proxy_android.h b/content/renderer/media/android/webmediaplayer_proxy_android.h index 8fed11b..d98afef 100644 --- a/content/renderer/media/android/webmediaplayer_proxy_android.h +++ b/content/renderer/media/android/webmediaplayer_proxy_android.h @@ -7,7 +7,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "content/public/renderer/render_view_observer.h" #include "googleurl/src/gurl.h" #include "media/base/android/demuxer_stream_player_params.h" diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h index 70070b3..29b4913 100644 --- a/content/renderer/media/render_media_log.h +++ b/content/renderer/media/render_media_log.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_MEDIA_RENDER_MEDIA_LOG_H_ #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_log.h" namespace base { diff --git a/content/renderer/media/rtc_video_decoder_bridge_tv.cc b/content/renderer/media/rtc_video_decoder_bridge_tv.cc index a0d281b..539e751 100644 --- a/content/renderer/media/rtc_video_decoder_bridge_tv.cc +++ b/content/renderer/media/rtc_video_decoder_bridge_tv.cc @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/renderer/media/rtc_video_decoder_factory_tv.h" #include "media/base/bind_to_loop.h" #include "media/base/decoder_buffer.h" diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h index 2ef49de..af48ad4 100644 --- a/content/renderer/media/webrtc_audio_device_not_impl.h +++ b/content/renderer/media/webrtc_audio_device_not_impl.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "third_party/webrtc/modules/audio_device/include/audio_device.h" diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 3f06790..93bb3cb 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -17,7 +17,7 @@ #include "base/logging.h" #include "base/strings/string_split.h" #include "base/sync_socket.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/child/child_process.h" #include "content/child/child_thread.h" #include "content/child/fileapi/file_system_dispatcher.h" diff --git a/content/renderer/pepper/pepper_video_destination_host.cc b/content/renderer/pepper/pepper_video_destination_host.cc index 4f0e63c..67234d5 100644 --- a/content/renderer/pepper/pepper_video_destination_host.cc +++ b/content/renderer/pepper/pepper_video_destination_host.cc @@ -4,7 +4,7 @@ #include "content/renderer/pepper/pepper_video_destination_host.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index 1cb4943..bf59f4c 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -5,7 +5,7 @@ #include "content/renderer/plugin_channel_host.h" #include "base/metrics/histogram.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/child/child_process.h" #include "content/child/npobject_base.h" #include "content/child/plugin_messages.h" diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h index c6819a9..7a41d41 100644 --- a/content/renderer/render_process_impl.h +++ b/content/renderer/render_process_impl.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_ #define CONTENT_RENDERER_RENDER_PROCESS_IMPL_H_ -#include "base/timer.h" +#include "base/timer/timer.h" #include "content/renderer/render_process.h" class SkCanvas; diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 71d9e5e..6508fc9 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -11,7 +11,7 @@ #include "base/observer_list.h" #include "base/strings/string16.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "build/build_config.h" #include "content/child/child_thread.h" #include "content/common/content_export.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index b19a1cb..3d815b1a 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -28,7 +28,7 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/child/appcache_dispatcher.h" #include "content/child/child_thread.h" #include "content/child/fileapi/file_system_dispatcher.h" diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 8a0ab86..20e67af 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -18,7 +18,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/process.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "build/build_config.h" #include "cc/input/top_controls_state.h" #include "content/common/content_export.h" diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 48ca7a9..e5ab989 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -13,8 +13,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "cc/debug/rendering_stats.h" #include "content/common/browser_rendering_stats.h" #include "content/common/content_export.h" diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index fa5eaab..423186b 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/message_loop.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" #include "content/public/test/test_utils.h" diff --git a/content/renderer/stats_collection_observer.cc b/content/renderer/stats_collection_observer.cc index 4192ec0..00211ff 100644 --- a/content/renderer/stats_collection_observer.cc +++ b/content/renderer/stats_collection_observer.cc @@ -4,7 +4,7 @@ #include "content/renderer/stats_collection_observer.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/renderer/render_view_impl.h" namespace content { diff --git a/content/renderer/stats_collection_observer.h b/content/renderer/stats_collection_observer.h index 52d67b8..298226f 100644 --- a/content/renderer/stats_collection_observer.h +++ b/content/renderer/stats_collection_observer.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_STATS_COLLECTION_OBSERVER_H_ #define CONTENT_RENDERER_STATS_COLLECTION_OBSERVER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "content/public/renderer/render_view_observer.h" namespace content { diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index a5461a7..6f7b01d 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -18,7 +18,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/renderer/history_item_serialization.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" |