diff options
Diffstat (limited to 'chrome')
59 files changed, 62 insertions, 62 deletions
diff --git a/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc b/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc index b5831b0..257fe26 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc +++ b/chrome/browser/net/evicted_domain_cookie_counter_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/net/evicted_domain_cookie_counter.h" #include "googleurl/src/gurl.h" #include "net/cookies/canonical_cookie.h" diff --git a/chrome/browser/net/http_server_properties_manager.h b/chrome/browser/net/http_server_properties_manager.h index ad87388..a63859a 100644 --- a/chrome/browser/net/http_server_properties_manager.h +++ b/chrome/browser/net/http_server_properties_manager.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "base/values.h" #include "net/base/host_port_pair.h" #include "net/http/http_pipelined_host_capability.h" diff --git a/chrome/browser/net/load_time_stats.cc b/chrome/browser/net/load_time_stats.cc index 8446b78..0801775 100644 --- a/chrome/browser/net/load_time_stats.cc +++ b/chrome/browser/net/load_time_stats.cc @@ -8,7 +8,7 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/net/load_time_stats.h b/chrome/browser/net/load_time_stats.h index 958e922..c7ea58d 100644 --- a/chrome/browser/net/load_time_stats.h +++ b/chrome/browser/net/load_time_stats.h @@ -13,7 +13,7 @@ #include "base/containers/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc index a2ac5e4..a299d52 100644 --- a/chrome/browser/net/network_stats.cc +++ b/chrome/browser/net/network_stats.cc @@ -12,7 +12,7 @@ #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/tuple.h" #include "chrome/common/chrome_version_info.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/net/network_stats.h b/chrome/browser/net/network_stats.h index d18aaf1..2d56c72 100644 --- a/chrome/browser/net/network_stats.h +++ b/chrome/browser/net/network_stats.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/io_thread.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/chrome/browser/net/network_time_tracker.h b/chrome/browser/net/network_time_tracker.h index 53e9bcc..5eaf97a 100644 --- a/chrome/browser/net/network_time_tracker.h +++ b/chrome/browser/net/network_time_tracker.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/network_time_notifier.h" class IOThread; diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index b7061c7..67273cb 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -20,7 +20,7 @@ #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/preconnect.h" diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index a2940a8..bc45792 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_info.h" diff --git a/chrome/browser/net/referrer.h b/chrome/browser/net/referrer.h index b38d96d..dbf821d 100644 --- a/chrome/browser/net/referrer.h +++ b/chrome/browser/net/referrer.h @@ -18,7 +18,7 @@ #include <map> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/net/timed_cache.h b/chrome/browser/net/timed_cache.h index f8b3c3b..dfcdc98 100644 --- a/chrome/browser/net/timed_cache.h +++ b/chrome/browser/net/timed_cache.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/containers/mru_cache.h" -#include "base/time.h" +#include "base/time/time.h" class GURL; diff --git a/chrome/browser/net/url_info.h b/chrome/browser/net/url_info.h index 54c8159..9cd60fd 100644 --- a/chrome/browser/net/url_info.h +++ b/chrome/browser/net/url_info.h @@ -19,7 +19,7 @@ #include <string> #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/net/url_info_unittest.cc b/chrome/browser/net/url_info_unittest.cc index 1ae6a89..730bb96 100644 --- a/chrome/browser/net/url_info_unittest.cc +++ b/chrome/browser/net/url_info_unittest.cc @@ -8,7 +8,7 @@ #include <string> #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/net/url_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/notifications/message_center_notification_manager.h b/chrome/browser/notifications/message_center_notification_manager.h index 6307e75..8ae5ee5 100644 --- a/chrome/browser/notifications/message_center_notification_manager.h +++ b/chrome/browser/notifications/message_center_notification_manager.h @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_member.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/notifications/notification_ui_manager_impl.h" diff --git a/chrome/browser/notifications/notification_ui_manager_impl.h b/chrome/browser/notifications/notification_ui_manager_impl.h index 273beea..f8544ea 100644 --- a/chrome/browser/notifications/notification_ui_manager_impl.h +++ b/chrome/browser/notifications/notification_ui_manager_impl.h @@ -12,7 +12,7 @@ #include "base/id_map.h" #include "base/memory/linked_ptr.h" #include "base/prefs/pref_member.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/notifications/sync_notifier/synced_notification.cc b/chrome/browser/notifications/sync_notifier/synced_notification.cc index e918c8b..69c19d6 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification.cc +++ b/chrome/browser/notifications/sync_notifier/synced_notification.cc @@ -6,7 +6,7 @@ #include "base/basictypes.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/notifications/notification.h" diff --git a/chrome/browser/omnibox/omnibox_log.h b/chrome/browser/omnibox/omnibox_log.h index 461ff85..a31c9c7 100644 --- a/chrome/browser/omnibox/omnibox_log.h +++ b/chrome/browser/omnibox/omnibox_log.h @@ -8,7 +8,7 @@ #include <stddef.h> #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "chrome/browser/sessions/session_id.h" diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc index 9144fa2..be50c61 100644 --- a/chrome/browser/password_manager/login_database.cc +++ b/chrome/browser/password_manager/login_database.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.h" #include "base/pickle.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/common/chrome_switches.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "sql/connection.h" diff --git a/chrome/browser/password_manager/login_database_unittest.cc b/chrome/browser/password_manager/login_database_unittest.cc index 6cba4bc..3338058 100644 --- a/chrome/browser/password_manager/login_database_unittest.cc +++ b/chrome/browser/password_manager/login_database_unittest.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/login_database.h" #include "chrome/common/chrome_paths.h" #include "content/public/common/password_form.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc index 735e381..68c54d4 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc @@ -18,7 +18,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h index f421831..567d733 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.h +++ b/chrome/browser/password_manager/native_backend_gnome_x.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/password_manager/password_store_x.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc index a35b7e4..fac8b9f4 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x_unittest.cc @@ -10,7 +10,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/native_backend_gnome_x.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.h b/chrome/browser/password_manager/native_backend_kwallet_x.h index e19bc3d..8029e610 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.h +++ b/chrome/browser/password_manager/native_backend_kwallet_x.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/password_manager/password_store_x.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h index 04fdffc..4d6079f 100644 --- a/chrome/browser/password_manager/password_store.h +++ b/chrome/browser/password_manager/password_store.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/threading/thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/common/cancelable_task_tracker.h" #include "components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h" diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 99c6ad4..a949061 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -10,7 +10,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" diff --git a/chrome/browser/password_manager/password_store_unittest.cc b/chrome/browser/password_manager/password_store_unittest.cc index a4b695a..458d222 100644 --- a/chrome/browser/password_manager/password_store_unittest.cc +++ b/chrome/browser/password_manager/password_store_unittest.cc @@ -7,7 +7,7 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_default.h" diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc index 488cb09..dfbe3c5 100644 --- a/chrome/browser/password_manager/password_store_win_unittest.cc +++ b/chrome/browser/password_manager/password_store_win_unittest.cc @@ -15,7 +15,7 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/password_manager/password_store_win.h" diff --git a/chrome/browser/password_manager/password_store_x.h b/chrome/browser/password_manager/password_store_x.h index 80c8527..05e0351 100644 --- a/chrome/browser/password_manager/password_store_x.h +++ b/chrome/browser/password_manager/password_store_x.h @@ -8,7 +8,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_store_default.h" class LoginDatabase; diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 22b7467..8b5cb44 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -14,7 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_consumer.h" diff --git a/chrome/browser/performance_monitor/constants.h b/chrome/browser/performance_monitor/constants.h index 5face47..168baf2 100644 --- a/chrome/browser/performance_monitor/constants.h +++ b/chrome/browser/performance_monitor/constants.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PERFORMANCE_MONITOR_CONSTANTS_H_ #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" namespace performance_monitor { @@ -34,7 +34,7 @@ const int64 kBytesPerMegabyte = kBytesPerKilobyte * (1 << 10); const int64 kBytesPerGigabyte = kBytesPerMegabyte * (1 << 10); const int64 kBytesPerTerabyte = kBytesPerGigabyte * (1 << 10); -// Time measurements - Most of these are imported from base/time.h +// Time measurements - Most of these are imported from base/time/time.h // These units are used for display (and it's related calculations), not for // any mathematical analysis. Thus we can estimate for values without an exact // conversion. diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc index a109f3b..36bc93c 100644 --- a/chrome/browser/performance_monitor/database.cc +++ b/chrome/browser/performance_monitor/database.cc @@ -13,7 +13,7 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/performance_monitor/key_builder.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/performance_monitor/database.h b/chrome/browser/performance_monitor/database.h index 0ac1fb8..87082cd 100644 --- a/chrome/browser/performance_monitor/database.h +++ b/chrome/browser/performance_monitor/database.h @@ -13,7 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/performance_monitor/constants.h" #include "chrome/browser/performance_monitor/event.h" #include "chrome/browser/performance_monitor/metric.h" diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc index f92505a..bde1fe3 100644 --- a/chrome/browser/performance_monitor/database_unittest.cc +++ b/chrome/browser/performance_monitor/database_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/performance_monitor/database.h" #include "chrome/browser/performance_monitor/key_builder.h" #include "chrome/browser/performance_monitor/metric.h" diff --git a/chrome/browser/performance_monitor/event.h b/chrome/browser/performance_monitor/event.h index 1dbbe3b..b7666b4 100644 --- a/chrome/browser/performance_monitor/event.h +++ b/chrome/browser/performance_monitor/event.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_ #define CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_ -#include "base/values.h" -#include "base/time.h" #include "base/memory/scoped_ptr.h" +#include "base/time/time.h" +#include "base/values.h" namespace performance_monitor { diff --git a/chrome/browser/performance_monitor/metric.cc b/chrome/browser/performance_monitor/metric.cc index de50cb3..2699c41 100644 --- a/chrome/browser/performance_monitor/metric.cc +++ b/chrome/browser/performance_monitor/metric.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/performance_monitor/constants.h" namespace performance_monitor { diff --git a/chrome/browser/performance_monitor/metric.h b/chrome/browser/performance_monitor/metric.h index a7772ec..ab9da9f 100644 --- a/chrome/browser/performance_monitor/metric.h +++ b/chrome/browser/performance_monitor/metric.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PERFORMANCE_MONITOR_METRIC_H_ #include <string> -#include "base/time.h" +#include "base/time/time.h" namespace performance_monitor { diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc index 4143f12..6d7ed4f 100644 --- a/chrome/browser/performance_monitor/performance_monitor.cc +++ b/chrome/browser/performance_monitor/performance_monitor.cc @@ -14,7 +14,7 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/threading/worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/extensions/crx_installer.h" diff --git a/chrome/browser/performance_monitor/performance_monitor.h b/chrome/browser/performance_monitor/performance_monitor.h index 652b4ea..d8cd74e 100644 --- a/chrome/browser/performance_monitor/performance_monitor.h +++ b/chrome/browser/performance_monitor/performance_monitor.h @@ -15,7 +15,7 @@ #include "base/memory/singleton.h" #include "base/process.h" #include "base/process_util.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/performance_monitor/database.h" #include "chrome/browser/performance_monitor/event.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/performance_monitor/performance_monitor_util.cc b/chrome/browser/performance_monitor/performance_monitor_util.cc index 2682240..7f94a01 100644 --- a/chrome/browser/performance_monitor/performance_monitor_util.cc +++ b/chrome/browser/performance_monitor/performance_monitor_util.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/performance_monitor/events.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/performance_monitor/performance_monitor_util.h b/chrome/browser/performance_monitor/performance_monitor_util.h index b1052db..7ad35bc 100644 --- a/chrome/browser/performance_monitor/performance_monitor_util.h +++ b/chrome/browser/performance_monitor/performance_monitor_util.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PERFORMANCE_MONITOR_PERFORMANCE_MONITOR_UTIL_H_ #include "base/callback.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/tracked_objects.h" #include "chrome/browser/performance_monitor/database.h" #include "chrome/browser/performance_monitor/event.h" diff --git a/chrome/browser/performance_monitor/startup_timer.h b/chrome/browser/performance_monitor/startup_timer.h index 2bab4db..fc32a320 100644 --- a/chrome/browser/performance_monitor/startup_timer.h +++ b/chrome/browser/performance_monitor/startup_timer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_STARTUP_TIMER_H_ #define CHROME_BROWSER_PERFORMANCE_MONITOR_STARTUP_TIMER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/policy/async_policy_loader.h b/chrome/browser/policy/async_policy_loader.h index bd787bf..ce7b05b 100644 --- a/chrome/browser/policy/async_policy_loader.h +++ b/chrome/browser/policy/async_policy_loader.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/policy/policy_service.h" namespace policy { diff --git a/chrome/browser/policy/cloud/cloud_policy_client.h b/chrome/browser/policy/cloud/cloud_policy_client.h index 010fe69..f30fcc1 100644 --- a/chrome/browser/policy/cloud/cloud_policy_client.h +++ b/chrome/browser/policy/cloud/cloud_policy_client.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/policy/cloud/cloud_policy_constants.h" #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.cc b/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.cc index b6d5bba..726622b 100644 --- a/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.cc +++ b/chrome/browser/policy/cloud/cloud_policy_client_registration_helper.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_urls.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h b/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h index 3c8da4d..c58580a 100644 --- a/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h +++ b/chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/policy/cloud/cloud_policy_client.h" #include "chrome/browser/policy/cloud/cloud_policy_store.h" #include "chrome/browser/policy/cloud/rate_limiter.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_validator.h b/chrome/browser/policy/cloud/cloud_policy_validator.h index 1a41840..d53a0c6 100644 --- a/chrome/browser/policy/cloud/cloud_policy_validator.h +++ b/chrome/browser/policy/cloud/cloud_policy_validator.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h" #include "policy/proto/cloud_policy.pb.h" diff --git a/chrome/browser/policy/cloud/external_policy_data_updater_unittest.cc b/chrome/browser/policy/cloud/external_policy_data_updater_unittest.cc index a07a088..9f8d61b 100644 --- a/chrome/browser/policy/cloud/external_policy_data_updater_unittest.cc +++ b/chrome/browser/policy/cloud/external_policy_data_updater_unittest.cc @@ -12,7 +12,7 @@ #include "base/sha1.h" #include "base/test/test_pending_task.h" #include "base/test/test_simple_task_runner.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/test_url_fetcher_factory.h" diff --git a/chrome/browser/policy/cloud/rate_limiter.h b/chrome/browser/policy/cloud/rate_limiter.h index f532a291..00af48d 100644 --- a/chrome/browser/policy/cloud/rate_limiter.h +++ b/chrome/browser/policy/cloud/rate_limiter.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "base/time.h" +#include "base/time/time.h" namespace base { class SequencedTaskRunner; diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 7b48485..7390fbf 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -22,7 +22,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/test/test_file_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" diff --git a/chrome/browser/policy/policy_statistics_collector.h b/chrome/browser/policy/policy_statistics_collector.h index 08a7c923..352a591 100644 --- a/chrome/browser/policy/policy_statistics_collector.h +++ b/chrome/browser/policy/policy_statistics_collector.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/memory/ref_counted.h" -#include "base/time.h" +#include "base/time/time.h" class PrefService; class PrefRegistrySimple; diff --git a/chrome/browser/policy/policy_statistics_collector_unittest.cc b/chrome/browser/policy/policy_statistics_collector_unittest.cc index 20e1319..06a68ca 100644 --- a/chrome/browser/policy/policy_statistics_collector_unittest.cc +++ b/chrome/browser/policy/policy_statistics_collector_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/testing_pref_service.h" #include "base/test/test_simple_task_runner.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/policy/mock_policy_service.h" #include "chrome/browser/policy/policy_map.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc index f1f2b9e..d29086c 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/predictors/autocomplete_action_predictor_table.h" #include "chrome/browser/predictors/predictor_database.h" #include "chrome/browser/predictors/predictor_database_factory.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc index 009234b..c6ffa7b 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/predictors/logged_in_predictor_table.h b/chrome/browser/predictors/logged_in_predictor_table.h index 9cdbd15..71dc7f0 100644 --- a/chrome/browser/predictors/logged_in_predictor_table.h +++ b/chrome/browser/predictors/logged_in_predictor_table.h @@ -8,7 +8,7 @@ #include <string> #include "base/containers/hash_tables.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/predictors/predictor_table_base.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/predictors/resource_prefetch_common.h b/chrome/browser/predictors/resource_prefetch_common.h index ab90972..13f276a 100644 --- a/chrome/browser/predictors/resource_prefetch_common.h +++ b/chrome/browser/predictors/resource_prefetch_common.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_COMMON_H_ #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_COMMON_H_ -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" class Profile; diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc index 4bce05e..7453009 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor.cc @@ -13,7 +13,7 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history_db_task.h" #include "chrome/browser/history/history_notifications.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h index fcf54b7..b0334b2 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.h +++ b/chrome/browser/predictors/resource_prefetch_predictor.h @@ -13,7 +13,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.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/predictors/resource_prefetch_common.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.h b/chrome/browser/predictors/resource_prefetch_predictor_tables.h index 9e7e18a..a85132f 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/predictors/predictor_table_base.h" #include "chrome/browser/predictors/resource_prefetch_common.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc index d438964..0221767 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/run_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" |