diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 07:27:01 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 07:27:01 +0000 |
commit | 0d8db08c32735b1fd916495227802d933b308991 (patch) | |
tree | 46a6673e641d0f8b771de7163b2e3ecc35c2142c /device | |
parent | b271a7cf0e398bc8426e7ead347f408f6f57b007 (diff) | |
download | chromium_src-0d8db08c32735b1fd916495227802d933b308991.zip chromium_src-0d8db08c32735b1fd916495227802d933b308991.tar.gz chromium_src-0d8db08c32735b1fd916495227802d933b308991.tar.bz2 |
Use a direct include of strings headers in crypto/, dbus/, device/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16123026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
-rw-r--r-- | device/bluetooth/bluetooth_device.h | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_device_experimental_chromeos.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_device_mac.mm | 4 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_device_win.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_device_win_unittest.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_profile_experimental_chromeos.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_profile_mac.mm | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_service_record_mac.mm | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_service_record_mac_unittest.mm | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_service_record_win.cc | 4 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_service_record_win_unittest.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_socket_mac.mm | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_task_manager_win.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_utils.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/test/mock_bluetooth_device.h | 2 |
15 files changed, 17 insertions, 17 deletions
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" |