summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:23:48 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:23:48 +0000
commitd2d79d501a2fdfd01ad1bcc96e4c54549860abe6 (patch)
treee8dc52f8e4f33b398b4d24ba239d9787f203edf5 /device
parentf72c7626dd87b43b9b54a5adb2be941ba9f3e353 (diff)
downloadchromium_src-d2d79d501a2fdfd01ad1bcc96e4c54549860abe6.zip
chromium_src-d2d79d501a2fdfd01ad1bcc96e4c54549860abe6.tar.gz
chromium_src-d2d79d501a2fdfd01ad1bcc96e4c54549860abe6.tar.bz2
Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, components/, courgette/, device/, extensions/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16614002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/bluetooth_device.cc2
-rw-r--r--device/bluetooth/bluetooth_experimental_chromeos_unittest.cc2
-rw-r--r--device/bluetooth/test/mock_bluetooth_device.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/device/bluetooth/bluetooth_device.cc b/device/bluetooth/bluetooth_device.cc
index 4a70627..7b6ee0d 100644
--- a/device/bluetooth/bluetooth_device.cc
+++ b/device/bluetooth/bluetooth_device.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "device/bluetooth/bluetooth_utils.h"
#include "grit/device_bluetooth_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc b/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
index 0a137c8..a680a4b 100644
--- a/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
#include "chromeos/dbus/fake_bluetooth_device_client.h"
#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc
index 61ab155..b4c6cfe 100644
--- a/device/bluetooth/test/mock_bluetooth_device.cc
+++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/test/mock_bluetooth_device.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "device/bluetooth/test/mock_bluetooth_adapter.h"
namespace device {