diff options
Diffstat (limited to 'sync')
42 files changed, 45 insertions, 46 deletions
diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc index e0b6f1a..e95a2df 100644 --- a/sync/api/sync_data.cc +++ b/sync/api/sync_data.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base_node.h" diff --git a/sync/engine/apply_control_data_updates_unittest.cc b/sync/engine/apply_control_data_updates_unittest.cc index d51ee25..2dca863 100644 --- a/sync/engine/apply_control_data_updates_unittest.cc +++ b/sync/engine/apply_control_data_updates_unittest.cc @@ -5,7 +5,7 @@ #include "base/format_macros.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "sync/engine/apply_control_data_updates.h" #include "sync/engine/syncer.h" #include "sync/engine/syncer_util.h" diff --git a/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc b/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc index c341e8f..6a0db18 100644 --- a/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc +++ b/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc @@ -6,7 +6,7 @@ #include "base/location.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "sync/engine/apply_updates_and_resolve_conflicts_command.h" #include "sync/engine/syncer.h" #include "sync/internal_api/public/test/test_entry_factory.h" diff --git a/sync/engine/build_commit_command.cc b/sync/engine/build_commit_command.cc index 71a67f2..0f16b80 100644 --- a/sync/engine/build_commit_command.cc +++ b/sync/engine/build_commit_command.cc @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "sync/engine/syncer_proto_util.h" #include "sync/internal_api/public/base/unique_position.h" #include "sync/protocol/bookmark_specifics.pb.h" diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h index df81e265..f46ee89 100644 --- a/sync/engine/net/server_connection_manager.h +++ b/sync/engine/net/server_connection_manager.h @@ -11,7 +11,7 @@ #include "base/atomicops.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "base/threading/thread_checker.h" diff --git a/sync/engine/process_commit_response_command_unittest.cc b/sync/engine/process_commit_response_command_unittest.cc index 0d25c01..1520ca2 100644 --- a/sync/engine/process_commit_response_command_unittest.cc +++ b/sync/engine/process_commit_response_command_unittest.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/location.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "sync/internal_api/public/test/test_entry_factory.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc index e2114f9..41054a3 100644 --- a/sync/engine/syncer_proto_util.cc +++ b/sync/engine/syncer_proto_util.cc @@ -5,7 +5,7 @@ #include "sync/engine/syncer_proto_util.h" #include "base/format_macros.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "google_apis/google_api_keys.h" #include "sync/engine/net/server_connection_manager.h" #include "sync/engine/syncer.h" diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index 71eef90..1b62696 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -19,8 +19,8 @@ #include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "build/build_config.h" #include "sync/engine/get_commit_ids_command.h" diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc index 93f2bef..d2992a6 100644 --- a/sync/engine/syncer_util.cc +++ b/sync/engine/syncer_util.cc @@ -12,7 +12,7 @@ #include "base/base64.h" #include "base/location.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sync/engine/conflict_resolver.h" #include "sync/engine/syncer_proto_util.h" #include "sync/engine/syncer_types.h" diff --git a/sync/internal_api/base_node.cc b/sync/internal_api/base_node.cc index c6989ca..3a719cd 100644 --- a/sync/internal_api/base_node.cc +++ b/sync/internal_api/base_node.cc @@ -6,7 +6,7 @@ #include <stack> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base_transaction.h" diff --git a/sync/internal_api/change_record.cc b/sync/internal_api/change_record.cc index 7e50e60..b3aeb99 100644 --- a/sync/internal_api/change_record.cc +++ b/sync/internal_api/change_record.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/change_record.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/read_node.h" diff --git a/sync/internal_api/http_bridge.cc b/sync/internal_api/http_bridge.cc index 8a783e7..3fa1bd6 100644 --- a/sync/internal_api/http_bridge.cc +++ b/sync/internal_api/http_bridge.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/cookies/cookie_monster.h" diff --git a/sync/internal_api/js_mutation_event_observer.cc b/sync/internal_api/js_mutation_event_observer.cc index 6d85620..3f1056f 100644 --- a/sync/internal_api/js_mutation_event_observer.cc +++ b/sync/internal_api/js_mutation_event_observer.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/js/js_event_details.h" #include "sync/js/js_event_handler.h" diff --git a/sync/internal_api/js_sync_encryption_handler_observer.cc b/sync/internal_api/js_sync_encryption_handler_observer.cc index d44bda7..2885dd1 100644 --- a/sync/internal_api/js_sync_encryption_handler_observer.cc +++ b/sync/internal_api/js_sync_encryption_handler_observer.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/util/sync_string_conversions.h" diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc index 96c78c9..cbc9996 100644 --- a/sync/internal_api/js_sync_manager_observer.cc +++ b/sync/internal_api/js_sync_manager_observer.cc @@ -8,7 +8,7 @@ #include "base/location.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/change_record.h" diff --git a/sync/internal_api/public/base/invalidation.cc b/sync/internal_api/public/base/invalidation.cc index 1fb7a0c..f5f6168 100644 --- a/sync/internal_api/public/base/invalidation.cc +++ b/sync/internal_api/public/base/invalidation.cc @@ -6,7 +6,7 @@ #include <cstddef> #include "base/rand_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" namespace syncer { diff --git a/sync/internal_api/public/base/unique_position.cc b/sync/internal_api/public/base/unique_position.cc index 6bce972..3d61546 100644 --- a/sync/internal_api/public/base/unique_position.cc +++ b/sync/internal_api/public/base/unique_position.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sync/protocol/unique_position.pb.h" #include "third_party/zlib/zlib.h" diff --git a/sync/internal_api/public/base/unique_position_unittest.cc b/sync/internal_api/public/base/unique_position_unittest.cc index 80bf118..22dae59 100644 --- a/sync/internal_api/public/base/unique_position_unittest.cc +++ b/sync/internal_api/public/base/unique_position_unittest.cc @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/sha1.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sync/protocol/unique_position.pb.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/internal_api/public/change_record_unittest.cc b/sync/internal_api/public/change_record_unittest.cc index b54410e..cd54189 100644 --- a/sync/internal_api/public/change_record_unittest.cc +++ b/sync/internal_api/public/change_record_unittest.cc @@ -5,7 +5,7 @@ #include "sync/internal_api/public/change_record.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/test/values_test_util.h" #include "base/values.h" #include "sync/protocol/extension_specifics.pb.h" diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc index 62c1605..bfe87df 100644 --- a/sync/internal_api/sync_manager_impl.cc +++ b/sync/internal_api/sync_manager_impl.cc @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/metrics/histogram.h" #include "base/observer_list.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/engine/sync_scheduler.h" #include "sync/engine/syncer_types.h" diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index 36e0f12..3022a00 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -18,8 +18,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/string_number_conversions.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/test/values_test_util.h" #include "base/values.h" diff --git a/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc index bde2b32..44a2a50 100644 --- a/sync/internal_api/write_node.cc +++ b/sync/internal_api/write_node.cc @@ -4,7 +4,7 @@ #include "sync/internal_api/public/write_node.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base_transaction.h" diff --git a/sync/notifier/sync_system_resources.cc b/sync/notifier/sync_system_resources.cc index 57e04fa..8829ce6 100644 --- a/sync/notifier/sync_system_resources.cc +++ b/sync/notifier/sync_system_resources.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "google/cacheinvalidation/deps/callback.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/push_client.h" diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc index 7d3b267..868fd37 100644 --- a/sync/protocol/proto_value_conversions.cc +++ b/sync/protocol/proto_value_conversions.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "sync/internal_api/public/base/unique_position.h" #include "sync/protocol/app_notification_specifics.pb.h" diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc index 792065c..b33366f 100644 --- a/sync/protocol/proto_value_conversions_unittest.cc +++ b/sync/protocol/proto_value_conversions_unittest.cc @@ -7,7 +7,7 @@ #include "sync/protocol/proto_value_conversions.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc index 1cbb445..74cde4f 100644 --- a/sync/syncable/directory.cc +++ b/sync/syncable/directory.cc @@ -7,7 +7,7 @@ #include "base/base64.h" #include "base/debug/trace_event.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sync/internal_api/public/base/unique_position.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" #include "sync/syncable/entry.h" diff --git a/sync/syncable/directory_backing_store.cc b/sync/syncable/directory_backing_store.cc index d53c492..f37ecc1 100644 --- a/sync/syncable/directory_backing_store.cc +++ b/sync/syncable/directory_backing_store.cc @@ -12,7 +12,7 @@ #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/rand_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "sql/connection.h" #include "sql/statement.h" diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc index f54dcf7..c40d564 100644 --- a/sync/syncable/directory_backing_store_unittest.cc +++ b/sync/syncable/directory_backing_store_unittest.cc @@ -11,7 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sql/connection.h" #include "sql/statement.h" #include "sync/base/sync_export.h" diff --git a/sync/syncable/entry.cc b/sync/syncable/entry.cc index 0cf1f5f..e9b9f64 100644 --- a/sync/syncable/entry.cc +++ b/sync/syncable/entry.cc @@ -7,7 +7,7 @@ #include <iomanip> #include "base/json/string_escape.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "sync/syncable/blob.h" #include "sync/syncable/directory.h" #include "sync/syncable/syncable_base_transaction.h" diff --git a/sync/syncable/entry_kernel.cc b/sync/syncable/entry_kernel.cc index 01f2cae..b65eaa2 100644 --- a/sync/syncable/entry_kernel.cc +++ b/sync/syncable/entry_kernel.cc @@ -4,7 +4,7 @@ #include "sync/syncable/entry_kernel.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sync/protocol/proto_value_conversions.h" #include "sync/syncable/syncable_enum_conversions.h" #include "sync/util/cryptographer.h" diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc index 3b4649b..3ceb080 100644 --- a/sync/syncable/syncable_unittest.cc +++ b/sync/syncable/syncable_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/synchronization/condition_variable.h" #include "base/test/values_test_util.h" #include "base/threading/platform_thread.h" diff --git a/sync/syncable/write_transaction_info.cc b/sync/syncable/write_transaction_info.cc index 98f1466..3f69da8 100644 --- a/sync/syncable/write_transaction_info.cc +++ b/sync/syncable/write_transaction_info.cc @@ -4,7 +4,7 @@ #include "sync/syncable/write_transaction_info.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" namespace syncer { namespace syncable { diff --git a/sync/test/accounts_client/test_accounts_client.cc b/sync/test/accounts_client/test_accounts_client.cc index 8257691..0b2327b 100644 --- a/sync/test/accounts_client/test_accounts_client.cc +++ b/sync/test/accounts_client/test_accounts_client.cc @@ -12,7 +12,7 @@ #include "base/json/json_writer.h" #include "base/message_loop.h" #include "base/run_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "base/values.h" #include "net/base/url_util.h" diff --git a/sync/test/engine/mock_connection_manager.cc b/sync/test/engine/mock_connection_manager.cc index 33371e9..61adfb9 100644 --- a/sync/test/engine/mock_connection_manager.cc +++ b/sync/test/engine/mock_connection_manager.cc @@ -9,9 +9,8 @@ #include <map> #include "base/location.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "sync/engine/syncer_proto_util.h" -#include "sync/test/engine/test_id_factory.h" #include "sync/protocol/bookmark_specifics.pb.h" #include "sync/syncable/directory.h" #include "sync/syncable/syncable_write_transaction.h" diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc index f45c0e5..79bb783 100644 --- a/sync/test/engine/test_directory_setter_upper.cc +++ b/sync/test/engine/test_directory_setter_upper.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/location.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "sync/syncable/directory.h" #include "sync/syncable/in_memory_directory_backing_store.h" #include "sync/syncable/mutable_entry.h" diff --git a/sync/test/engine/test_id_factory.h b/sync/test/engine/test_id_factory.h index 10568ad..85781a7 100644 --- a/sync/test/engine/test_id_factory.h +++ b/sync/test/engine/test_id_factory.h @@ -9,7 +9,7 @@ #include <string> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "sync/syncable/syncable_id.h" namespace syncer { diff --git a/sync/test/local_sync_test_server.cc b/sync/test/local_sync_test_server.cc index 6b3e37f..ede4b77 100644 --- a/sync/test/local_sync_test_server.cc +++ b/sync/test/local_sync_test_server.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" #include "net/test/spawned_test_server/spawned_test_server.h" diff --git a/sync/tools/testserver/run_sync_testserver.cc b/sync/tools/testserver/run_sync_testserver.cc index a13443f..589333b 100644 --- a/sync/tools/testserver/run_sync_testserver.cc +++ b/sync/tools/testserver/run_sync_testserver.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_timeouts.h" #include "net/test/python_utils.h" #include "sync/test/local_sync_test_server.h" diff --git a/sync/util/cryptographer_unittest.cc b/sync/util/cryptographer_unittest.cc index 1541d36..c045064 100644 --- a/sync/util/cryptographer_unittest.cc +++ b/sync/util/cryptographer_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "sync/protocol/password_specifics.pb.h" #include "sync/test/fake_encryptor.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/sync/util/get_session_name_mac.mm b/sync/util/get_session_name_mac.mm index b67bbd7..f576ea7 100644 --- a/sync/util/get_session_name_mac.mm +++ b/sync/util/get_session_name_mac.mm @@ -8,7 +8,7 @@ #include <sys/sysctl.h> #include "base/mac/scoped_cftyperef.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" namespace syncer { diff --git a/sync/util/nigori.cc b/sync/util/nigori.cc index 60fc895..5f8298a 100644 --- a/sync/util/nigori.cc +++ b/sync/util/nigori.cc @@ -9,7 +9,7 @@ #include "base/base64.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/sys_byteorder.h" #include "crypto/encryptor.h" #include "crypto/hmac.h" diff --git a/sync/util/nigori_unittest.cc b/sync/util/nigori_unittest.cc index 7b6ac16..88c2461 100644 --- a/sync/util/nigori_unittest.cc +++ b/sync/util/nigori_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { |