From 6c3bf032651d5f912775e0c8cd7e962454145ced Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Wed, 25 Dec 2013 19:37:03 +0000 Subject: 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 --- rlz/mac/lib/machine_id_mac.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'rlz/mac') diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc index af39bb8..6dbb0d7 100644 --- a/rlz/mac/lib/machine_id_mac.cc +++ b/rlz/mac/lib/machine_id_mac.cc @@ -123,9 +123,10 @@ bool GetRawMachineId(base::string16* data, int* more_data) { data->clear(); if (GetMacAddress(mac_address, sizeof(mac_address))) { - *data += ASCIIToUTF16(base::StringPrintf("mac:%02x%02x%02x%02x%02x%02x", - mac_address[0], mac_address[1], mac_address[2], - mac_address[3], mac_address[4], mac_address[5])); + *data += base::ASCIIToUTF16( + base::StringPrintf("mac:%02x%02x%02x%02x%02x%02x", + mac_address[0], mac_address[1], mac_address[2], + mac_address[3], mac_address[4], mac_address[5])); } // A MAC address is enough to uniquely identify a machine, but it's only 6 @@ -134,8 +135,8 @@ bool GetRawMachineId(base::string16* data, int* more_data) { CFStringRef serial = CopySerialNumber(); if (serial) { if (!data->empty()) - *data += UTF8ToUTF16(" "); - *data += UTF8ToUTF16("serial:") + base::SysCFStringRefToUTF16(serial); + *data += base::UTF8ToUTF16(" "); + *data += base::UTF8ToUTF16("serial:") + base::SysCFStringRefToUTF16(serial); CFRelease(serial); } -- cgit v1.1