diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
| commit | 3df79f4277938356ae3c7b3ecc25ab6165e8a899 (patch) | |
| tree | a1a39cd236c8800a13f2f3bf879d69505a2508de /rlz | |
| parent | 8a15ea13737ae2f8444424fc14d1fcd5e42d5218 (diff) | |
| download | chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.zip chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.gz chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.bz2 | |
mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.
This CL was created fully mechanically by running
git grep -l base::mac::ScopedCFTypeRef | xargs sed -i -e 's/base::mac::ScopedCFTypeRef/base::ScopedCFTypeRef/g'
git commit -a -m.
git clang-format HEAD^ --style=Chromium
git commit -a -m.
git cl upload -t $TITLE
BUG=251957
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/16917011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz')
| -rw-r--r-- | rlz/mac/lib/machine_id_mac.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc index 12b3214..f16175b 100644 --- a/rlz/mac/lib/machine_id_mac.cc +++ b/rlz/mac/lib/machine_id_mac.cc @@ -25,13 +25,14 @@ namespace { // The caller is responsible for freeing |matching_services|. bool FindEthernetInterfaces(io_iterator_t* matching_services) { - base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict( + base::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict( IOServiceMatching(kIOEthernetInterfaceClass)); if (!matching_dict) return false; - base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> primary_interface( - CFDictionaryCreateMutable(kCFAllocatorDefault, 0, + base::ScopedCFTypeRef<CFMutableDictionaryRef> primary_interface( + CFDictionaryCreateMutable(kCFAllocatorDefault, + 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); if (!primary_interface) @@ -69,7 +70,7 @@ bool GetMACAddressFromIterator(io_iterator_t primary_interface_iterator, if (!success) continue; - base::mac::ScopedCFTypeRef<CFTypeRef> mac_data( + base::ScopedCFTypeRef<CFTypeRef> mac_data( IORegistryEntryCreateCFProperty(primary_interface_parent, CFSTR(kIOMACAddress), kCFAllocatorDefault, @@ -101,7 +102,7 @@ CFStringRef CopySerialNumber() { if (!expert_device) return NULL; - base::mac::ScopedCFTypeRef<CFTypeRef> serial_number( + base::ScopedCFTypeRef<CFTypeRef> serial_number( IORegistryEntryCreateCFProperty(expert_device, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, |