diff options
55 files changed, 61 insertions, 61 deletions
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.h b/chrome/browser/android/chrome_web_contents_delegate_android.h index dbfb535..d86c89f 100644 --- a/chrome/browser/android/chrome_web_contents_delegate_android.h +++ b/chrome/browser/android/chrome_web_contents_delegate_android.h @@ -8,7 +8,7 @@ #include <jni.h> #include "base/files/file_path.h" -#include "base/time.h" +#include "base/time/time.h" #include "components/web_contents_delegate_android/web_contents_delegate_android.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 6353f44..656db59 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/android/provider/blocking_ui_thread_async_request.h" #include "chrome/browser/android/provider/bookmark_model_observer_task.h" #include "chrome/browser/android/provider/run_on_ui_thread_blocking.h" diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index 37eb6dc..facdfe2 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -13,7 +13,7 @@ #include "base/metrics/histogram.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/autocomplete/autocomplete_controller_delegate.h" #include "chrome/browser/autocomplete/bookmark_provider.h" #include "chrome/browser/autocomplete/builtin_provider.h" diff --git a/chrome/browser/autocomplete/autocomplete_controller.h b/chrome/browser/autocomplete/autocomplete_controller.h index 6812c79..5b06749 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.h +++ b/chrome/browser/autocomplete/autocomplete_controller.h @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/strings/string16.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc index 5c45f4b..fc6774c 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -10,7 +10,7 @@ #include "base/strings/string_number_conversions.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_provider.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/autocomplete/bookmark_provider.cc b/chrome/browser/autocomplete/bookmark_provider.cc index bee5367..dec4751 100644 --- a/chrome/browser/autocomplete/bookmark_provider.cc +++ b/chrome/browser/autocomplete/bookmark_provider.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/autocomplete/autocomplete_result.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index 7be9e6a..dee9b48 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -16,7 +16,7 @@ #include "base/strings/string_number_conversions.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_result.h" #include "chrome/browser/autocomplete/history_url_provider.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 0e9e87f..893402c 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -10,7 +10,7 @@ #include "base/path_service.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/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index 03bf26c..3d9cea3 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -18,8 +18,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index aa8e4be..36a5abf9 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_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 "build/build_config.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc index 1d380b3..597957b 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.cc +++ b/chrome/browser/autocomplete/shortcuts_provider.cc @@ -17,7 +17,7 @@ #include "base/strings/string_number_conversions.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_input.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" #include "chrome/browser/autocomplete/autocomplete_result.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc index 09296a1..ab86bff 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider.cc @@ -12,7 +12,7 @@ #include "base/strings/string16.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_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 181554a..a269b64d 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -13,7 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index ccfb056..f482544f3 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -13,7 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_json.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 2b97faf..9ccef4b 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -24,7 +24,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index f14f594..1d05732 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -12,7 +12,7 @@ #include "base/prefs/pref_service.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/automation/automation_provider_json.h" #include "chrome/browser/automation/automation_provider_observers.h" #include "chrome/browser/automation/automation_util.h" diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc index bf3ed52..a815718 100644 --- a/chrome/browser/automation/url_request_automation_job.cc +++ b/chrome/browser/automation/url_request_automation_job.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/automation/automation_resource_message_filter.h" #include "chrome/common/automation_messages.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/bookmarks/bookmark_html_reader.cc b/chrome/browser/bookmarks/bookmark_html_reader.cc index 8b2dcca..cdaadb8 100644 --- a/chrome/browser/bookmarks/bookmark_html_reader.cc +++ b/chrome/browser/bookmarks/bookmark_html_reader.cc @@ -10,7 +10,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/bookmarks/imported_bookmark_entry.h" #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/favicon/imported_favicon_usage.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 620628a..47eee0a 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_codec.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 9bca46c..7927116 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -11,7 +11,7 @@ #include "base/strings/string16.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/bookmarks/bookmark_html_reader.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index b4f5a0c..b52e2cb 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -18,7 +18,7 @@ #include "base/strings/string_split.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/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 431a6d1..b7b2ce1 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -11,7 +11,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/bookmarks/bookmark_codec.h" #include "chrome/browser/bookmarks/bookmark_index.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 6c49ec7..ea04f7f 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -14,7 +14,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/history/query_parser.h" diff --git a/chrome/browser/bookmarks/imported_bookmark_entry.h b/chrome/browser/bookmarks/imported_bookmark_entry.h index 73bf0a9..cd2fda3 100644 --- a/chrome/browser/bookmarks/imported_bookmark_entry.h +++ b/chrome/browser/bookmarks/imported_bookmark_entry.h @@ -8,7 +8,7 @@ #include <vector> #include "base/strings/string16.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" struct ImportedBookmarkEntry { diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 020bd42..66191dc 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -18,7 +18,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" #include "base/threading/non_thread_safe.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/browser_process.h" class ChromeNetLog; diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index e9f7a8a..925e33e 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -20,7 +20,7 @@ #include "base/strings/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h index f3f03cd..5b8960e 100644 --- a/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h +++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h @@ -14,7 +14,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/indexed_db_context.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h index c41c7a7..a2dc394 100644 --- a/chrome/browser/browsing_data/browsing_data_local_storage_helper.h +++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h @@ -14,7 +14,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/common/url_constants.h" #include "content/public/browser/dom_storage_context.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index 9eb1597..a831f9b 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h @@ -13,7 +13,7 @@ #include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event_watcher.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/dom_storage_context.h" diff --git a/chrome/browser/captive_portal/captive_portal_detector.h b/chrome/browser/captive_portal/captive_portal_detector.h index 7ecda27..162ae6e 100644 --- a/chrome/browser/captive_portal/captive_portal_detector.h +++ b/chrome/browser/captive_portal/captive_portal_detector.h @@ -11,7 +11,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" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/captive_portal/captive_portal_detector_unittest.cc b/chrome/browser/captive_portal/captive_portal_detector_unittest.cc index c0c1806..6e22244 100644 --- a/chrome/browser/captive_portal/captive_portal_detector_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_detector_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/captive_portal/testing_utils.h" #include "chrome/test/base/testing_profile.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h index f9c5b4a..87e2b1f 100644 --- a/chrome/browser/captive_portal/captive_portal_service.h +++ b/chrome/browser/captive_portal/captive_portal_service.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_member.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/captive_portal/captive_portal_detector.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader.h b/chrome/browser/captive_portal/captive_portal_tab_reloader.h index 212f520..83a7686 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_reloader.h +++ b/chrome/browser/captive_portal/captive_portal_tab_reloader.h @@ -9,8 +9,8 @@ #include "base/callback_forward.h" #include "base/compiler_specific.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 "chrome/browser/captive_portal/captive_portal_service.h" class Profile; diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc index 2dd7fc3..00256c7 100644 --- a/chrome/browser/chrome_browser_field_trials.cc +++ b/chrome/browser/chrome_browser_field_trials.cc @@ -10,7 +10,7 @@ #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/omnibox/omnibox_field_trial.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/chrome_browser_field_trials_desktop.h b/chrome/browser/chrome_browser_field_trials_desktop.h index 16358cd..2668e7e 100644 --- a/chrome/browser/chrome_browser_field_trials_desktop.h +++ b/chrome/browser/chrome_browser_field_trials_desktop.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_DESKTOP_H_ #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" class CommandLine; class PrefService; diff --git a/chrome/browser/chrome_browser_field_trials_mobile.h b/chrome/browser/chrome_browser_field_trials_mobile.h index 4aca806..dac9603 100644 --- a/chrome/browser/chrome_browser_field_trials_mobile.h +++ b/chrome/browser/chrome_browser_field_trials_mobile.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROME_BROWSER_FIELD_TRIALS_MOBILE_H_ #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" class CommandLine; class PrefService; diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 65651fd..99e40d4 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -34,7 +34,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "base/threading/platform_thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/chrome_to_mobile_service.h b/chrome/browser/chrome_to_mobile_service.h index 499d856..ff297b9 100644 --- a/chrome/browser/chrome_to_mobile_service.h +++ b/chrome/browser/chrome_to_mobile_service.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/sessions/session_id.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h index 729da7f..8de4589 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/singleton.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/chromeos/system/automatic_reboot_manager_observer.h" #include "chrome/browser/extensions/update_observer.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index 4b1c987..f37386d 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc @@ -16,7 +16,7 @@ #include "base/strings/string_number_conversions.h" #include "base/test/scoped_path_override.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h" diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc index 0dd80fe..b1d38b4 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.h b/chrome/browser/chromeos/app_mode/startup_app_launcher.h index 8d63387..a4bc841 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.h +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/timer.h" +#include "base/timer/timer.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer.cc index 37a7a0b..c3a2f53 100644 --- a/chrome/browser/chromeos/attestation/attestation_policy_observer.cc +++ b/chrome/browser/chromeos/attestation/attestation_policy_observer.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/location.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/chromeos/attestation/attestation_ca_client.h" #include "chrome/browser/chromeos/attestation/attestation_key_payload.pb.h" #include "chrome/browser/chromeos/settings/cros_settings.h" diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index 7522d61..a9919ae 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -21,7 +21,7 @@ #include "base/strings/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/authentication_notification_details.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h index dc420e8..2312a57 100644 --- a/chrome/browser/chromeos/boot_times_loader.h +++ b/chrome/browser/chromeos/boot_times_loader.h @@ -11,7 +11,7 @@ #include "base/atomic_sequence_num.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/chromeos/contacts/contact_map.h b/chrome/browser/chromeos/contacts/contact_map.h index 22de98e..66a8444 100644 --- a/chrome/browser/chromeos/contacts/contact_map.h +++ b/chrome/browser/chromeos/contacts/contact_map.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/stl_util.h" -#include "base/time.h" +#include "base/time/time.h" namespace contacts { diff --git a/chrome/browser/chromeos/contacts/contact_map_unittest.cc b/chrome/browser/chromeos/contacts/contact_map_unittest.cc index dc7bb96..ebd46e1 100644 --- a/chrome/browser/chromeos/contacts/contact_map_unittest.cc +++ b/chrome/browser/chromeos/contacts/contact_map_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "chrome/browser/chromeos/contacts/contact_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/contacts/contact_test_util.cc b/chrome/browser/chromeos/contacts/contact_test_util.cc index 6ef76dc..071083a 100644 --- a/chrome/browser/chromeos/contacts/contact_test_util.cc +++ b/chrome/browser/chromeos/contacts/contact_test_util.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/chromeos/contacts/contact_map.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service.cc index 0d614cb..5c89189 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service.cc @@ -16,8 +16,8 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/strings/string_util.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "chrome/browser/google_apis/gdata_contacts_requests.h" diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service.h b/chrome/browser/chromeos/contacts/gdata_contacts_service.h index 886f48a..d13b8cf 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service.h +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service.h @@ -13,7 +13,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" class Profile; diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.h b/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.h index bc23a69..0be0213 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.h +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_stub.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/time.h" +#include "base/time/time.h" namespace contacts { typedef std::vector<const contacts::Contact*> ContactPointers; diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc index 0ffe075..ac43ff8 100644 --- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc +++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/message_loop.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "chrome/browser/chromeos/contacts/contact_test_util.h" #include "chrome/browser/google_apis/auth_service.h" diff --git a/chrome/browser/chromeos/contacts/google_contact_store.h b/chrome/browser/chromeos/contacts/google_contact_store.h index b880ea4..8773722 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store.h +++ b/chrome/browser/chromeos/contacts/google_contact_store.h @@ -17,8 +17,8 @@ #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "chrome/browser/chromeos/contacts/contact_map.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc b/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc index 377ce35..de42453 100644 --- a/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc +++ b/chrome/browser/chromeos/contacts/google_contact_store_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" #include "chrome/browser/chromeos/contacts/contact_store_observer.h" #include "chrome/browser/chromeos/contacts/contact_test_util.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 1c430b4..bb28341 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -22,7 +22,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/win/registry.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_comptr.h" |