summaryrefslogtreecommitdiffstats
path: root/rlz
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:40:45 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:40:45 +0000
commit906265870c8a3cc44ebbcad14eaea84559a49aed (patch)
treefc025f2e228464be651f0ea502fb7415467e8278 /rlz
parent3aef722b8c533efc87df683a454f0779f9b6cabb (diff)
downloadchromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.zip
chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.gz
chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.bz2
Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, printing/, remoting/, rlz/, skia/, sql/, sync/, third_party/, tools/, webkit/, win8/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15995038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz')
-rw-r--r--rlz/lib/financial_ping.cc2
-rw-r--r--rlz/lib/financial_ping_test.cc2
-rw-r--r--rlz/lib/machine_id_unittest.cc2
-rw-r--r--rlz/lib/string_utils_unittest.cc2
-rw-r--r--rlz/mac/lib/machine_id_mac.cc2
-rw-r--r--rlz/win/lib/registry_util.cc2
-rw-r--r--rlz/win/lib/rlz_value_store_registry.cc4
7 files changed, 8 insertions, 8 deletions
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
index e6cbef3..0c49506 100644
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/assert.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/machine_id.h"
diff --git a/rlz/lib/financial_ping_test.cc b/rlz/lib/financial_ping_test.cc
index c04cf46..8df566c 100644
--- a/rlz/lib/financial_ping_test.cc
+++ b/rlz/lib/financial_ping_test.cc
@@ -20,7 +20,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/machine_id.h"
#include "rlz/lib/rlz_lib.h"
diff --git a/rlz/lib/machine_id_unittest.cc b/rlz/lib/machine_id_unittest.cc
index cecf529..9d0d35f 100644
--- a/rlz/lib/machine_id_unittest.cc
+++ b/rlz/lib/machine_id_unittest.cc
@@ -5,7 +5,7 @@
#include "rlz/lib/machine_id.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "rlz/test/rlz_test_helpers.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/rlz/lib/string_utils_unittest.cc b/rlz/lib/string_utils_unittest.cc
index 82a6edb..d8be24a8 100644
--- a/rlz/lib/string_utils_unittest.cc
+++ b/rlz/lib/string_utils_unittest.cc
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/assert.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc
index 0d26d1d..e66d152 100644
--- a/rlz/mac/lib/machine_id_mac.cc
+++ b/rlz/mac/lib/machine_id_mac.cc
@@ -15,7 +15,7 @@
#include "base/string16.h"
#include "base/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
namespace rlz_lib {
diff --git a/rlz/win/lib/registry_util.cc b/rlz/win/lib/registry_util.cc
index 6a324d5..674661a 100644
--- a/rlz/win/lib/registry_util.cc
+++ b/rlz/win/lib/registry_util.cc
@@ -8,7 +8,7 @@
#include "rlz/win/lib/registry_util.h"
#include "base/process_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "base/win/windows_version.h"
#include "rlz/lib/assert.h"
diff --git a/rlz/win/lib/rlz_value_store_registry.cc b/rlz/win/lib/rlz_value_store_registry.cc
index 36c53d5..3008437 100644
--- a/rlz/win/lib/rlz_value_store_registry.cc
+++ b/rlz/win/lib/rlz_value_store_registry.cc
@@ -4,9 +4,9 @@
#include "rlz/win/lib/rlz_value_store_registry.h"
-#include "base/win/registry.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/win/registry.h"
#include "rlz/lib/assert.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/rlz_lib.h"