summaryrefslogtreecommitdiffstats
path: root/rlz/lib
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 19:37:03 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 19:37:03 +0000
commit6c3bf032651d5f912775e0c8cd7e962454145ced (patch)
tree88cf8b652147b9acf47aa81999f8652609890dde /rlz/lib
parentce51317df2e23a717f95e56e1a9db1a7fb330a16 (diff)
downloadchromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.zip
chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.gz
chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.bz2
Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/, tools/, webkit/, win8/ to use the base:: namespace.
BUG=330556 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/121123002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz/lib')
-rw-r--r--rlz/lib/machine_id_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/rlz/lib/machine_id_unittest.cc b/rlz/lib/machine_id_unittest.cc
index bcae511..b3f3c61 100644
--- a/rlz/lib/machine_id_unittest.cc
+++ b/rlz/lib/machine_id_unittest.cc
@@ -11,7 +11,7 @@
// This test will fail if the behavior of GetMachineId changes.
TEST(MachineDealCodeTestMachineId, MachineId) {
- base::string16 computer_sid(UTF8ToUTF16(
+ base::string16 computer_sid(base::UTF8ToUTF16(
"S-1-5-21-2345599882-2448789067-1921365677"));
std::string id;
rlz_lib::testing::GetMachineIdImpl(computer_sid, 2651229008, &id);