Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
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 @@
// 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 @@
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 @@
if (!expert_device)
return NULL;
- base::mac::ScopedCFTypeRef<CFTypeRef> serial_number(
+ base::ScopedCFTypeRef<CFTypeRef> serial_number(
IORegistryEntryCreateCFProperty(expert_device,
CFSTR(kIOPlatformSerialNumberKey),
kCFAllocatorDefault,