diff options
39 files changed, 47 insertions, 47 deletions
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc index 1dc58fb..edf29ad 100644 --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc @@ -19,7 +19,7 @@ #include "rlz/lib/string_utils.h" #if !defined(OS_WIN) -#include "base/time.h" +#include "base/time/time.h" #endif #if defined(RLZ_NETWORK_IMPLEMENTATION_WIN_INET) @@ -47,7 +47,7 @@ class InternetHandle { #include "base/bind.h" #include "base/message_loop.h" #include "base/run_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" diff --git a/rlz/lib/financial_ping_test.cc b/rlz/lib/financial_ping_test.cc index eff252d4..4580a1f 100644 --- a/rlz/lib/financial_ping_test.cc +++ b/rlz/lib/financial_ping_test.cc @@ -32,7 +32,7 @@ #if defined(OS_WIN) #include "rlz/win/lib/machine_deal.h" #else -#include "base/time.h" +#include "base/time/time.h" #endif namespace { diff --git a/skia/ext/convolver_unittest.cc b/skia/ext/convolver_unittest.cc index 9e59a8c..f99bf78 100644 --- a/skia/ext/convolver_unittest.cc +++ b/skia/ext/convolver_unittest.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "skia/ext/convolver.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index f30a85d..c61da0c 100644 --- a/skia/ext/image_operations.cc +++ b/skia/ext/image_operations.cc @@ -14,12 +14,12 @@ #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "skia/ext/convolver.h" #include "third_party/skia/include/core/SkColorPriv.h" -#include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkFontHost.h" +#include "third_party/skia/include/core/SkRect.h" namespace skia { diff --git a/skia/ext/image_operations_bench.cc b/skia/ext/image_operations_bench.cc index e7dd64d..b433615 100644 --- a/skia/ext/image_operations_bench.cc +++ b/skia/ext/image_operations_bench.cc @@ -23,7 +23,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 "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/skia/ext/recursive_gaussian_convolution_unittest.cc b/skia/ext/recursive_gaussian_convolution_unittest.cc index ac3f78c..3f00bac 100644 --- a/skia/ext/recursive_gaussian_convolution_unittest.cc +++ b/skia/ext/recursive_gaussian_convolution_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/time.h" +#include "base/time/time.h" #include "skia/ext/convolver.h" #include "skia/ext/recursive_gaussian_convolution.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sql/connection.h b/sql/connection.h index 6b03849..a2e8f67 100644 --- a/sql/connection.h +++ b/sql/connection.h @@ -16,7 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_restrictions.h" -#include "base/time.h" +#include "base/time/time.h" #include "sql/sql_export.h" struct sqlite3; diff --git a/sync/engine/backoff_delay_provider.h b/sync/engine/backoff_delay_provider.h index 3aaa93a..892e6e8 100644 --- a/sync/engine/backoff_delay_provider.h +++ b/sync/engine/backoff_delay_provider.h @@ -5,7 +5,7 @@ #ifndef SYNC_ENGINE_BACKOFF_DELAY_PROVIDER_H_ #define SYNC_ENGINE_BACKOFF_DELAY_PROVIDER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" namespace syncer { diff --git a/sync/engine/backoff_delay_provider_unittest.cc b/sync/engine/backoff_delay_provider_unittest.cc index 4e7bfc2..1bf17cb 100644 --- a/sync/engine/backoff_delay_provider_unittest.cc +++ b/sync/engine/backoff_delay_provider_unittest.cc @@ -5,7 +5,7 @@ #include "sync/engine/backoff_delay_provider.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/internal_api/public/engine/polling_constants.h" #include "sync/internal_api/public/sessions/model_neutral_state.h" #include "sync/internal_api/public/util/syncer_error.h" diff --git a/sync/engine/sync_scheduler.h b/sync/engine/sync_scheduler.h index afaaca7..8eb361e 100644 --- a/sync/engine/sync_scheduler.h +++ b/sync/engine/sync_scheduler.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/engine/nudge_source.h" #include "sync/internal_api/public/base/model_type_invalidation_map.h" diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h index 3350267..c10d57b 100644 --- a/sync/engine/sync_scheduler_impl.h +++ b/sync/engine/sync_scheduler_impl.h @@ -16,8 +16,8 @@ #include "base/memory/scoped_ptr.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 "sync/base/sync_export.h" #include "sync/engine/net/server_connection_manager.h" #include "sync/engine/nudge_source.h" diff --git a/sync/engine/syncer.cc b/sync/engine/syncer.cc index 070f9ab..c4ef671 100644 --- a/sync/engine/syncer.cc +++ b/sync/engine/syncer.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "sync/engine/apply_control_data_updates.h" #include "sync/engine/apply_updates_and_resolve_conflicts_command.h" diff --git a/sync/engine/syncer_proto_util.h b/sync/engine/syncer_proto_util.h index 9faddf8..4e627e0 100644 --- a/sync/engine/syncer_proto_util.h +++ b/sync/engine/syncer_proto_util.h @@ -8,7 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/util/syncer_error.h" diff --git a/sync/engine/syncer_proto_util_unittest.cc b/sync/engine/syncer_proto_util_unittest.cc index 32e4531..e7f2a04 100644 --- a/sync/engine/syncer_proto_util_unittest.cc +++ b/sync/engine/syncer_proto_util_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/internal_api/public/base/model_type_test_util.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/protocol/password_specifics.pb.h" diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index 3361caf..24a8aaa 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -21,7 +21,7 @@ #include "base/message_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "build/build_config.h" #include "sync/engine/get_commit_ids_command.h" #include "sync/engine/net/server_connection_manager.h" diff --git a/sync/engine/traffic_recorder.h b/sync/engine/traffic_recorder.h index 94639ab..55ee0b3 100644 --- a/sync/engine/traffic_recorder.h +++ b/sync/engine/traffic_recorder.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "sync/base/sync_export.h" #include "sync/protocol/sync.pb.h" diff --git a/sync/engine/traffic_recorder_unittest.cc b/sync/engine/traffic_recorder_unittest.cc index 4928604..363a3c8 100644 --- a/sync/engine/traffic_recorder_unittest.cc +++ b/sync/engine/traffic_recorder_unittest.cc @@ -5,7 +5,7 @@ #include "sync/engine/traffic_recorder.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "sync/protocol/sync.pb.h" #include "sync/util/time.h" diff --git a/sync/internal_api/public/base/invalidation.h b/sync/internal_api/public/base/invalidation.h index ba70493..e1e274e 100644 --- a/sync/internal_api/public/base/invalidation.h +++ b/sync/internal_api/public/base/invalidation.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 "sync/base/sync_export.h" namespace base { diff --git a/sync/internal_api/public/base_node.h b/sync/internal_api/public/base_node.h index a9f50bc..51cc30c 100644 --- a/sync/internal_api/public/base_node.h +++ b/sync/internal_api/public/base_node.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "googleurl/src/gurl.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/sync/internal_api/public/data_type_association_stats.h b/sync/internal_api/public/data_type_association_stats.h index ddddb94..ba38f65 100644 --- a/sync/internal_api/public/data_type_association_stats.h +++ b/sync/internal_api/public/data_type_association_stats.h @@ -5,7 +5,7 @@ #ifndef SYNC_INTERNAL_API_PUBLIC_DATA_TYPE_ASSOCIATION_STATS_H_ #define SYNC_INTERNAL_API_PUBLIC_DATA_TYPE_ASSOCIATION_STATS_H_ -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" namespace syncer { diff --git a/sync/internal_api/public/engine/sync_status.h b/sync/internal_api/public/engine/sync_status.h index b28d361..124dac6 100644 --- a/sync/internal_api/public/engine/sync_status.h +++ b/sync/internal_api/public/engine/sync_status.h @@ -7,7 +7,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/sync_encryption_handler.h" diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h index 3e1c20e..e1053ad 100644 --- a/sync/internal_api/public/sessions/sync_session_snapshot.h +++ b/sync/internal_api/public/sessions/sync_session_snapshot.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base/progress_marker_map.h" diff --git a/sync/internal_api/public/sync_encryption_handler.h b/sync/internal_api/public/sync_encryption_handler.h index e4df223..cd1cfc0 100644 --- a/sync/internal_api/public/sync_encryption_handler.h +++ b/sync/internal_api/public/sync_encryption_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc index 2e28e75..9e10026 100644 --- a/sync/internal_api/sync_encryption_handler_impl.cc +++ b/sync/internal_api/sync_encryption_handler_impl.cc @@ -11,16 +11,16 @@ #include "base/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/message_loop.h" -#include "base/time.h" -#include "base/tracked_objects.h" #include "base/metrics/histogram.h" +#include "base/time/time.h" +#include "base/tracked_objects.h" #include "sync/internal_api/public/read_node.h" #include "sync/internal_api/public/read_transaction.h" #include "sync/internal_api/public/user_share.h" #include "sync/internal_api/public/util/experiments.h" +#include "sync/internal_api/public/util/sync_string_conversions.h" #include "sync/internal_api/public/write_node.h" #include "sync/internal_api/public/write_transaction.h" -#include "sync/internal_api/public/util/sync_string_conversions.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h index f3a7909..4b4e99b 100644 --- a/sync/internal_api/sync_encryption_handler_impl.h +++ b/sync/internal_api/sync_encryption_handler_impl.h @@ -9,11 +9,11 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" -#include "base/time.h" -#include "base/threading/thread_checker.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/sync_encryption_handler.h" #include "sync/syncable/nigori_handler.h" diff --git a/sync/internal_api/syncapi_server_connection_manager_unittest.cc b/sync/internal_api/syncapi_server_connection_manager_unittest.cc index 282c5d3..950cd35 100644 --- a/sync/internal_api/syncapi_server_connection_manager_unittest.cc +++ b/sync/internal_api/syncapi_server_connection_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" -#include "base/time.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "sync/internal_api/public/http_post_provider_factory.h" #include "sync/internal_api/public/http_post_provider_interface.h" diff --git a/sync/notifier/ack_tracker.h b/sync/notifier/ack_tracker.h index a21a914..9f2ca1d 100644 --- a/sync/notifier/ack_tracker.h +++ b/sync/notifier/ack_tracker.h @@ -11,8 +11,8 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "base/threading/thread_checker.h" -#include "base/time.h" -#include "base/timer.h" +#include "base/time/time.h" +#include "base/timer/timer.h" #include "net/base/backoff_entry.h" #include "sync/base/sync_export.h" #include "sync/notifier/invalidation_util.h" diff --git a/sync/notifier/registration_manager.h b/sync/notifier/registration_manager.h index 7dfef1a..e190a7f 100644 --- a/sync/notifier/registration_manager.h +++ b/sync/notifier/registration_manager.h @@ -12,8 +12,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" // For invalidation::InvalidationListener::RegistrationState. #include "google/cacheinvalidation/include/invalidation-listener.h" #include "google/cacheinvalidation/include/types.h" diff --git a/sync/notifier/sync_invalidation_listener_unittest.cc b/sync/notifier/sync_invalidation_listener_unittest.cc index ad56ab9..afaca86 100644 --- a/sync/notifier/sync_invalidation_listener_unittest.cc +++ b/sync/notifier/sync_invalidation_listener_unittest.cc @@ -9,8 +9,8 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/time.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/fake_push_client.h" diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc index 79d4886..718a78a 100644 --- a/sync/protocol/proto_value_conversions_unittest.cc +++ b/sync/protocol/proto_value_conversions_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/protocol/app_notification_specifics.pb.h" diff --git a/sync/sessions/data_type_tracker.h b/sync/sessions/data_type_tracker.h index d6da946..65d5926 100644 --- a/sync/sessions/data_type_tracker.h +++ b/sync/sessions/data_type_tracker.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/protocol/sync.pb.h" namespace syncer { diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h index 5f8de13..ec70f2c 100644 --- a/sync/sessions/status_controller.h +++ b/sync/sessions/status_controller.h @@ -33,7 +33,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/sessions/model_neutral_state.h" #include "sync/sessions/ordered_commit_set.h" diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h index dcb0220..32dbdd1 100644 --- a/sync/sessions/sync_session.h +++ b/sync/sessions/sync_session.h @@ -22,7 +22,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/engine/model_safe_worker.h" diff --git a/sync/syncable/directory_backing_store.cc b/sync/syncable/directory_backing_store.cc index 8bc7eac..0dd22a7 100644 --- a/sync/syncable/directory_backing_store.cc +++ b/sync/syncable/directory_backing_store.cc @@ -13,7 +13,7 @@ #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "sql/connection.h" #include "sql/statement.h" #include "sql/transaction.h" diff --git a/sync/syncable/entry_kernel.h b/sync/syncable/entry_kernel.h index 16a6e97..562ebdb 100644 --- a/sync/syncable/entry_kernel.h +++ b/sync/syncable/entry_kernel.h @@ -7,7 +7,7 @@ #include <set> -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "sync/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/sync/test/accounts_client/test_accounts_client.cc b/sync/test/accounts_client/test_accounts_client.cc index 0b2327b..3a48bfa 100644 --- a/sync/test/accounts_client/test_accounts_client.cc +++ b/sync/test/accounts_client/test_accounts_client.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/time.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/url_util.h" #include "net/http/http_status_code.h" diff --git a/sync/util/data_type_histogram.h b/sync/util/data_type_histogram.h index c149839..5c8e840 100644 --- a/sync/util/data_type_histogram.h +++ b/sync/util/data_type_histogram.h @@ -6,7 +6,7 @@ #define SYNC_UTIL_DATA_TYPE_HISTOGRAM_H_ #include "base/metrics/histogram.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/internal_api/public/base/model_type.h" // For now, this just implements UMA_HISTOGRAM_LONG_TIMES. This can be adjusted diff --git a/sync/util/data_type_histogram_unittest.cc b/sync/util/data_type_histogram_unittest.cc index 6ca1619..67b5e64 100644 --- a/sync/util/data_type_histogram_unittest.cc +++ b/sync/util/data_type_histogram_unittest.cc @@ -4,7 +4,7 @@ #include "sync/util/data_type_histogram.h" -#include "base/time.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/util/time.h b/sync/util/time.h index 79cb958..f28a6f0 100644 --- a/sync/util/time.h +++ b/sync/util/time.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/time.h" +#include "base/time/time.h" #include "sync/base/sync_export.h" namespace syncer { |