diff options
28 files changed, 32 insertions, 32 deletions
diff --git a/crypto/encryptor_openssl.cc b/crypto/encryptor_openssl.cc index cb26e22..b643c72 100644 --- a/crypto/encryptor_openssl.cc +++ b/crypto/encryptor_openssl.cc @@ -8,7 +8,7 @@ #include <openssl/evp.h> #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "crypto/openssl_util.h" #include "crypto/symmetric_key.h" diff --git a/crypto/encryptor_unittest.cc b/crypto/encryptor_unittest.cc index b0ec4bc..5b234d2 100644 --- a/crypto/encryptor_unittest.cc +++ b/crypto/encryptor_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "crypto/symmetric_key.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 1db0f8e..bbbaa70 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -33,7 +33,7 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/native_library.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" diff --git a/crypto/random_unittest.cc b/crypto/random_unittest.cc index 297f3cc..846d9b6 100644 --- a/crypto/random_unittest.cc +++ b/crypto/random_unittest.cc @@ -4,7 +4,7 @@ #include "crypto/random.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" // Basic functionality tests. Does NOT test the security of the random data. diff --git a/crypto/rsa_private_key.cc b/crypto/rsa_private_key.cc index 62eb996..812d9fa 100644 --- a/crypto/rsa_private_key.cc +++ b/crypto/rsa_private_key.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" // This file manually encodes and decodes RSA private keys using PrivateKeyInfo // from PKCS #8 and RSAPrivateKey from PKCS #1. These structures are: diff --git a/crypto/rsa_private_key_nss.cc b/crypto/rsa_private_key_nss.cc index ea2b432..a89454e 100644 --- a/crypto/rsa_private_key_nss.cc +++ b/crypto/rsa_private_key_nss.cc @@ -14,7 +14,7 @@ #include "base/debug/leak_annotations.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "crypto/nss_util.h" #include "crypto/nss_util_internal.h" #include "crypto/scoped_nss_types.h" diff --git a/crypto/rsa_private_key_win.cc b/crypto/rsa_private_key_win.cc index 07f071e..29ee663 100644 --- a/crypto/rsa_private_key_win.cc +++ b/crypto/rsa_private_key_win.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #pragma comment(lib, "crypt32.lib") diff --git a/crypto/symmetric_key_openssl.cc b/crypto/symmetric_key_openssl.cc index 899a942..e1c6fb7 100644 --- a/crypto/symmetric_key_openssl.cc +++ b/crypto/symmetric_key_openssl.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "crypto/openssl_util.h" namespace crypto { diff --git a/crypto/symmetric_key_unittest.cc b/crypto/symmetric_key_unittest.cc index 389d7f5..f0b4a60 100644 --- a/crypto/symmetric_key_unittest.cc +++ b/crypto/symmetric_key_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" TEST(SymmetricKeyTest, GenerateRandomKey) { diff --git a/dbus/dbus_statistics.cc b/dbus/dbus_statistics.cc index eeb2f0ac..ebec4e5 100644 --- a/dbus/dbus_statistics.cc +++ b/dbus/dbus_statistics.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/time.h" diff --git a/dbus/message.cc b/dbus/message.cc index 737b0c4..02fa090 100644 --- a/dbus/message.cc +++ b/dbus/message.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/format_macros.h" #include "base/logging.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "dbus/object_path.h" #if defined(USE_SYSTEM_PROTOBUF) diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index d7012ad..3bb91a6 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" #include "base/strings/string_piece.h" +#include "base/strings/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "dbus/dbus_statistics.h" diff --git a/dbus/string_util.cc b/dbus/string_util.cc index 4d4c9da..f35c9b3 100644 --- a/dbus/string_util.cc +++ b/dbus/string_util.cc @@ -4,7 +4,7 @@ #include "dbus/string_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" namespace dbus { diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h index c1655ed..831e5e5 100644 --- a/device/bluetooth/bluetooth_device.h +++ b/device/bluetooth/bluetooth_device.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" -#include "base/string16.h" +#include "base/strings/string16.h" namespace device { diff --git a/device/bluetooth/bluetooth_device_experimental_chromeos.cc b/device/bluetooth/bluetooth_device_experimental_chromeos.cc index 595ff19..b6932ba 100644 --- a/device/bluetooth/bluetooth_device_experimental_chromeos.cc +++ b/device/bluetooth/bluetooth_device_experimental_chromeos.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/experimental_bluetooth_adapter_client.h" #include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h" diff --git a/device/bluetooth/bluetooth_device_mac.mm b/device/bluetooth/bluetooth_device_mac.mm index ef54af1..39acbef 100644 --- a/device/bluetooth/bluetooth_device_mac.mm +++ b/device/bluetooth/bluetooth_device_mac.mm @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/hash.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/sys_string_conversions.h" #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h" #include "device/bluetooth/bluetooth_profile_mac.h" diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc index 11dc529..34b7b40 100644 --- a/device/bluetooth/bluetooth_device_win.cc +++ b/device/bluetooth/bluetooth_device_win.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h" #include "device/bluetooth/bluetooth_profile_win.h" #include "device/bluetooth/bluetooth_service_record_win.h" diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc index 0f41665..93fd990 100644 --- a/device/bluetooth/bluetooth_device_win_unittest.cc +++ b/device/bluetooth/bluetooth_device_win_unittest.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "device/bluetooth/bluetooth_device_win.h" #include "device/bluetooth/bluetooth_service_record.h" #include "device/bluetooth/bluetooth_task_manager_win.h" diff --git a/device/bluetooth/bluetooth_profile_experimental_chromeos.cc b/device/bluetooth/bluetooth_profile_experimental_chromeos.cc index 2ccea24..57a6a43 100644 --- a/device/bluetooth/bluetooth_profile_experimental_chromeos.cc +++ b/device/bluetooth/bluetooth_profile_experimental_chromeos.cc @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/task_runner_util.h" #include "base/threading/thread_restrictions.h" #include "base/threading/worker_pool.h" diff --git a/device/bluetooth/bluetooth_profile_mac.mm b/device/bluetooth/bluetooth_profile_mac.mm index 7829793..4956651 100644 --- a/device/bluetooth/bluetooth_profile_mac.mm +++ b/device/bluetooth/bluetooth_profile_mac.mm @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "device/bluetooth/bluetooth_device_mac.h" #include "device/bluetooth/bluetooth_socket_mac.h" diff --git a/device/bluetooth/bluetooth_service_record_mac.mm b/device/bluetooth/bluetooth_service_record_mac.mm index 3410351..306d5e5 100644 --- a/device/bluetooth/bluetooth_service_record_mac.mm +++ b/device/bluetooth/bluetooth_service_record_mac.mm @@ -14,7 +14,7 @@ #include <string> #include "base/basictypes.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" namespace { diff --git a/device/bluetooth/bluetooth_service_record_mac_unittest.mm b/device/bluetooth/bluetooth_service_record_mac_unittest.mm index 8cfb46f..22e4d1a 100644 --- a/device/bluetooth/bluetooth_service_record_mac_unittest.mm +++ b/device/bluetooth/bluetooth_service_record_mac_unittest.mm @@ -11,7 +11,7 @@ #include <string> #include "base/basictypes.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/device/bluetooth/bluetooth_service_record_win.cc b/device/bluetooth/bluetooth_service_record_win.cc index a09b335..e0ba750 100644 --- a/device/bluetooth/bluetooth_service_record_win.cc +++ b/device/bluetooth/bluetooth_service_record_win.cc @@ -7,8 +7,8 @@ #include <string> #include "base/basictypes.h" -#include "base/string_number_conversions.h" -#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "device/bluetooth/bluetooth_init_win.h" #include "device/bluetooth/bluetooth_utils.h" diff --git a/device/bluetooth/bluetooth_service_record_win_unittest.cc b/device/bluetooth/bluetooth_service_record_win_unittest.cc index 5f5c03e..804b620 100644 --- a/device/bluetooth/bluetooth_service_record_win_unittest.cc +++ b/device/bluetooth/bluetooth_service_record_win_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "device/bluetooth/bluetooth_service_record_win.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/device/bluetooth/bluetooth_socket_mac.mm b/device/bluetooth/bluetooth_socket_mac.mm index 036f6f1..3751441 100644 --- a/device/bluetooth/bluetooth_socket_mac.mm +++ b/device/bluetooth/bluetooth_socket_mac.mm @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "device/bluetooth/bluetooth_service_record.h" #include "device/bluetooth/bluetooth_service_record_mac.h" diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc index 2fca071..3b1ad5f 100644 --- a/device/bluetooth/bluetooth_task_manager_win.cc +++ b/device/bluetooth/bluetooth_task_manager_win.cc @@ -14,7 +14,7 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/sequenced_task_runner.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/win/scoped_handle.h" diff --git a/device/bluetooth/bluetooth_utils.cc b/device/bluetooth/bluetooth_utils.cc index 4f30202..b1f9f781 100644 --- a/device/bluetooth/bluetooth_utils.cc +++ b/device/bluetooth/bluetooth_utils.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" namespace { static const char* kCommonUuidPostfix = "-0000-1000-8000-00805f9b34fb"; diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h index d61f6ff..6020579 100644 --- a/device/bluetooth/test/mock_bluetooth_device.h +++ b/device/bluetooth/test/mock_bluetooth_device.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h" #include "testing/gmock/include/gmock/gmock.h" |