diff options
61 files changed, 68 insertions, 68 deletions
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc index 90f3855..7e50792 100644 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -11,7 +11,7 @@ #include "base/cpu.h" #include "base/metrics/histogram.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_browser_main.h" diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index dbd63b4..ea640c7 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -21,7 +21,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "base/third_party/nspr/prtime.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/tracked_objects.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc index b78c0d7..c41a8ec 100644 --- a/chrome/browser/metrics/metrics_log_unittest.cc +++ b/chrome/browser/metrics/metrics_log_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/tracked_objects.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/metrics/metrics_log.h" diff --git a/chrome/browser/metrics/metrics_reporting_scheduler.h b/chrome/browser/metrics/metrics_reporting_scheduler.h index 320c41b..695f6ec 100644 --- a/chrome/browser/metrics/metrics_reporting_scheduler.h +++ b/chrome/browser/metrics/metrics_reporting_scheduler.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/callback.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" // Scheduler task to drive a MetricsService object's uploading. class MetricsReportingScheduler { diff --git a/chrome/browser/metrics/perf_provider_chromeos.h b/chrome/browser/metrics/perf_provider_chromeos.h index e3130be..6ba943e0 100644 --- a/chrome/browser/metrics/perf_provider_chromeos.h +++ b/chrome/browser/metrics/perf_provider_chromeos.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/threading/non_thread_safe.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/common/metrics/proto/perf_data.pb.h" namespace metrics { diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h index 0e7fd6c..487d6de 100644 --- a/chrome/browser/metrics/thread_watcher.h +++ b/chrome/browser/metrics/thread_watcher.h @@ -57,7 +57,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/threading/watchdog.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc index fdd03ec..6670722 100644 --- a/chrome/browser/metrics/thread_watcher_unittest.cc +++ b/chrome/browser/metrics/thread_watcher_unittest.cc @@ -16,7 +16,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/metrics/thread_watcher.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_win.h b/chrome/browser/metrics/variations/variations_registry_syncer_win.h index 297a3ca..18ad9d5 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_win.h +++ b/chrome/browser/metrics/variations/variations_registry_syncer_win.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_REGISTRY_SYNCER_WIN_H_ #define CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_REGISTRY_SYNCER_WIN_H_ -#include "base/timer.h" +#include "base/timer/timer.h" namespace chrome_variations { diff --git a/chrome/browser/metrics/variations/variations_request_scheduler.h b/chrome/browser/metrics/variations/variations_request_scheduler.h index f8b258d..beb3bbf 100644 --- a/chrome/browser/metrics/variations/variations_request_scheduler.h +++ b/chrome/browser/metrics/variations/variations_request_scheduler.h @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/gtest_prod_util.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" class PrefService; diff --git a/chrome/browser/metrics/variations/variations_service.h b/chrome/browser/metrics/variations/variations_service.h index 35c2723..17b6777 100644 --- a/chrome/browser/metrics/variations/variations_service.h +++ b/chrome/browser/metrics/variations/variations_service.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/metrics/proto/study.pb.h" #include "chrome/browser/metrics/proto/trials_seed.pb.h" #include "chrome/browser/metrics/variations/variations_request_scheduler.h" diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc index c5aed31..89e8b48 100644 --- a/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc +++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/net/cert_logger.pb.h" #include "net/base/load_flags.h" #include "net/base/upload_bytes_element_reader.h" diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index 796b2f3..95fbfd3 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/chrome/browser/net/crl_set_fetcher.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/net/dns_probe_job.cc b/chrome/browser/net/dns_probe_job.cc index 204484e..f51f450 100644 --- a/chrome/browser/net/dns_probe_job.cc +++ b/chrome/browser/net/dns_probe_job.cc @@ -8,7 +8,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 "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/chrome/browser/net/dns_probe_service.h b/chrome/browser/net/dns_probe_service.h index c40967a..a906d75 100644 --- a/chrome/browser/net/dns_probe_service.h +++ b/chrome/browser/net/dns_probe_service.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/net/dns_probe_job.h" #include "chrome/common/net/net_error_info.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/net/evicted_domain_cookie_counter.h b/chrome/browser/net/evicted_domain_cookie_counter.h index cd952c8..5cf8797 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter.h +++ b/chrome/browser/net/evicted_domain_cookie_counter.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/cookies/cookie_monster.h" namespace net { diff --git a/chrome/browser/prerender/prerender_config.h b/chrome/browser/prerender/prerender_config.h index f31d62d..11729a1 100644 --- a/chrome/browser/prerender/prerender_config.h +++ b/chrome/browser/prerender/prerender_config.h @@ -7,7 +7,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "ui/gfx/rect.h" namespace prerender { diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 4b3422c..fca0c8f 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_origin.h" diff --git a/chrome/browser/prerender/prerender_histograms.h b/chrome/browser/prerender/prerender_histograms.h index ade1340..541780b 100644 --- a/chrome/browser/prerender/prerender_histograms.h +++ b/chrome/browser/prerender/prerender_histograms.h @@ -7,7 +7,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_local_predictor.h" diff --git a/chrome/browser/prerender/prerender_history.h b/chrome/browser/prerender/prerender_history.h index 31dcbd4..dcaa62a 100644 --- a/chrome/browser/prerender/prerender_history.h +++ b/chrome/browser/prerender/prerender_history.h @@ -8,7 +8,7 @@ #include <list> #include "base/threading/non_thread_safe.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_origin.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/prerender/prerender_link_manager.h b/chrome/browser/prerender/prerender_link_manager.h index b9987d8..1d77507 100644 --- a/chrome/browser/prerender/prerender_link_manager.h +++ b/chrome/browser/prerender/prerender_link_manager.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/prerender/prerender_handle.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc index 34f1500..5ab80c8 100644 --- a/chrome/browser/prerender/prerender_local_predictor.cc +++ b/chrome/browser/prerender/prerender_local_predictor.cc @@ -14,7 +14,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history_db_task.h" diff --git a/chrome/browser/prerender/prerender_local_predictor.h b/chrome/browser/prerender/prerender_local_predictor.h index 590eeb8..641cafb 100644 --- a/chrome/browser/prerender/prerender_local_predictor.h +++ b/chrome/browser/prerender/prerender_local_predictor.h @@ -10,7 +10,7 @@ #include "base/containers/hash_tables.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/visit_database.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index ef21538..b54d8d0 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -17,7 +17,7 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/common/cancelable_request.h" diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index 9cbba47..7e6e330 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -17,8 +17,8 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/predictors/logged_in_predictor_table.h" #include "chrome/browser/prerender/prerender_config.h" #include "chrome/browser/prerender/prerender_contents.h" diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc index 50075f0..5203148 100644 --- a/chrome/browser/prerender/prerender_tab_helper.cc +++ b/chrome/browser/prerender/prerender_tab_helper.cc @@ -6,7 +6,7 @@ #include "base/metrics/histogram.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/predictors/logged_in_predictor_table.h" #include "chrome/browser/prerender/prerender_histograms.h" #include "chrome/browser/prerender/prerender_local_predictor.h" diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h index f20368f0..3a050d3 100644 --- a/chrome/browser/prerender/prerender_tab_helper.h +++ b/chrome/browser/prerender/prerender_tab_helper.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc index aeed782..7045e66 100644 --- a/chrome/browser/prerender/prerender_unittest.cc +++ b/chrome/browser/prerender/prerender_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_handle.h" #include "chrome/browser/prerender/prerender_link_manager.h" diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc index 9fdeaa5..d7a18bc 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc @@ -13,7 +13,7 @@ #include "base/rand_util.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" #include "chrome/browser/service/service_process_control.h" diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index f71bc39..65b8d3e77 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc @@ -9,7 +9,7 @@ #include "base/message_loop.h" #include "base/threading/thread_restrictions.h" #include "base/threading/worker_pool.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/printing/print_job_worker.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index f5efeb7..17666df 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_error_dialog.h" #include "chrome/browser/printing/print_job.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index 2164ea0..b68e56d 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -76,8 +76,8 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #if defined(TOOLKIT_GTK) #include "chrome/browser/ui/gtk/process_singleton_dialog.h" #endif diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index cff14fb..cb4a1c3 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -15,7 +15,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/win/metro.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h index 797cc75..51d54f4 100644 --- a/chrome/browser/profiles/gaia_info_update_service.h +++ b/chrome/browser/profiles/gaia_info_update_service.h @@ -9,7 +9,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_member.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/profiles/profile_downloader.h" #include "chrome/browser/profiles/profile_downloader_delegate.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" diff --git a/chrome/browser/profiles/profile_destroyer.h b/chrome/browser/profiles/profile_destroyer.h index 70a4752..b258377 100644 --- a/chrome/browser/profiles/profile_destroyer.h +++ b/chrome/browser/profiles/profile_destroyer.h @@ -8,7 +8,7 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 4ac54a5..9f24987 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_impl_io_data.h" #include "content/public/browser/content_browser_client.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc index 186bca3..53b3b0a 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc @@ -4,7 +4,7 @@ #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle.h b/chrome/browser/renderer_host/safe_browsing_resource_throttle.h index 9d46fcc..3a0a16a0 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_throttle.h +++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle.h @@ -9,8 +9,8 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/safe_browsing/database_manager.h" #include "chrome/browser/safe_browsing/ui_manager.h" #include "content/public/browser/resource_throttle.h" diff --git a/chrome/browser/renderer_host/web_cache_manager.cc b/chrome/browser/renderer_host/web_cache_manager.cc index 812fcca..0136501 100644 --- a/chrome/browser/renderer_host/web_cache_manager.cc +++ b/chrome/browser/renderer_host/web_cache_manager.cc @@ -14,7 +14,7 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/sys_info.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h index c190752..d142dcc 100644 --- a/chrome/browser/renderer_host/web_cache_manager.h +++ b/chrome/browser/renderer_host/web_cache_manager.h @@ -16,7 +16,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "third_party/WebKit/public/web/WebCache.h" diff --git a/chrome/browser/rlz/rlz.h b/chrome/browser/rlz/rlz.h index e4a361c..d55e05c1 100644 --- a/chrome/browser/rlz/rlz.h +++ b/chrome/browser/rlz/rlz.h @@ -16,7 +16,7 @@ #include "base/memory/singleton.h" #include "base/strings/string16.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "rlz/lib/rlz_lib.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 1ebf378..6d5a17a 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -12,7 +12,7 @@ #include "base/format_macros.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h index 6ea8bf1..1c7964f 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.h +++ b/chrome/browser/safe_browsing/browser_feature_extractor.h @@ -21,7 +21,7 @@ #include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner_helpers.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index e52cbfd..dd24f0d 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 87503a6..4d78a25 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -13,7 +13,7 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h index f89de22..7a4ab35 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.h +++ b/chrome/browser/safe_browsing/client_side_detection_service.h @@ -27,7 +27,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 "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 87d471e..9f0dd7d 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/common/safe_browsing/client_model.pb.h" #include "chrome/common/safe_browsing/csd.pb.h" diff --git a/chrome/browser/safe_browsing/database_manager.h b/chrome/browser/safe_browsing/database_manager.h index 5e9520f..28d6385 100644 --- a/chrome/browser/safe_browsing/database_manager.h +++ b/chrome/browser/safe_browsing/database_manager.h @@ -19,7 +19,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/protocol_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 9fe83807..2c5f590 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -16,7 +16,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/download_feedback_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/sandboxed_zip_analyzer.h" diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc index 31f662d..37ada0c 100644 --- a/chrome/browser/safe_browsing/malware_details_unittest.cc +++ b/chrome/browser/safe_browsing/malware_details_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/pickle.h" #include "base/run_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/safe_browsing/ping_manager_unittest.cc b/chrome/browser/safe_browsing/ping_manager_unittest.cc index 8673c24..585b31b 100644 --- a/chrome/browser/safe_browsing/ping_manager_unittest.cc +++ b/chrome/browser/safe_browsing/ping_manager_unittest.cc @@ -5,7 +5,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/ping_manager.h" #include "google_apis/google_api_keys.h" #include "net/base/escape.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index ff8856c..6c13779 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -14,7 +14,7 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 9fa2d95..a3533e6 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -22,8 +22,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/safe_browsing/chunk_range.h" #include "chrome/browser/safe_browsing/protocol_manager_helper.h" #include "chrome/browser/safe_browsing/protocol_parser.h" diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc index 06af5ad..22854f6 100644 --- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc +++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc @@ -6,7 +6,7 @@ #include "base/strings/stringprintf.h" #include "base/test/test_simple_task_runner.h" #include "base/thread_task_runner_handle.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/protocol_manager.h" #include "google_apis/google_api_keys.h" #include "net/base/escape.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index e724f31..720836f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -18,7 +18,7 @@ #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h index b625714..1bf835b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h @@ -33,7 +33,7 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/ui_manager.h" #include "content/public/browser/interstitial_page_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 39954d6..fca21c4 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" #include "base/process_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/prefix_set.h" #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index ca61644..9a3b933 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" #include "chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 3254a6cd..17522f6 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -17,7 +17,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/test/thread_test_helper.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h index 196f6c1..917e357 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.h +++ b/chrome/browser/safe_browsing/safe_browsing_store.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #include "base/containers/hash_tables.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" namespace base { diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index b33bc2e..fe2e14e 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -29,7 +29,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/database_manager.h" diff --git a/chrome/browser/safe_browsing/ui_manager.h b/chrome/browser/safe_browsing/ui_manager.h index b2e394f..ed3fdd021 100644 --- a/chrome/browser/safe_browsing/ui_manager.h +++ b/chrome/browser/safe_browsing/ui_manager.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "content/public/browser/notification_observer.h" #include "googleurl/src/gurl.h" |