Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Unified Diff: base/ios/device_util.mm

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/mac/foundation_util.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/ios/device_util.mm
diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm
index 96968df1e0bdd11d5db1b99f6ef58e5d7c3bef44..96008332befe11986bd405bf0cc540f9bf023b38 100644
--- a/base/ios/device_util.mm
+++ b/base/ios/device_util.mm
@@ -119,9 +119,9 @@ std::string GetMacAddress(const std::string& interface_name) {
}
std::string GetRandomId() {
- base::mac::ScopedCFTypeRef<CFUUIDRef>
- uuid_object(CFUUIDCreate(kCFAllocatorDefault));
- base::mac::ScopedCFTypeRef<CFStringRef> uuid_string(
+ base::ScopedCFTypeRef<CFUUIDRef> uuid_object(
+ CFUUIDCreate(kCFAllocatorDefault));
+ base::ScopedCFTypeRef<CFStringRef> uuid_string(
CFUUIDCreateString(kCFAllocatorDefault, uuid_object));
return base::SysCFStringRefToUTF8(uuid_string);
}
@@ -154,9 +154,9 @@ std::string GetDeviceIdentifier(const char* salt) {
CC_SHA256([hash_data bytes], [hash_data length], hash);
CFUUIDBytes* uuid_bytes = reinterpret_cast<CFUUIDBytes*>(hash);
- base::mac::ScopedCFTypeRef<CFUUIDRef>
- uuid_object(CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, *uuid_bytes));
- base::mac::ScopedCFTypeRef<CFStringRef> device_id(
+ base::ScopedCFTypeRef<CFUUIDRef> uuid_object(
+ CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, *uuid_bytes));
+ base::ScopedCFTypeRef<CFStringRef> device_id(
CFUUIDCreateString(kCFAllocatorDefault, uuid_object));
return base::SysCFStringRefToUTF8(device_id);
}
« no previous file with comments | « no previous file | base/mac/foundation_util.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698