diff --git a/DEPS b/DEPS index d268bd96..2c67a689 100644 --- a/DEPS +++ b/DEPS @@ -47,7 +47,7 @@ deps = { '9719c1e1e676814c456b55f5f070eabad6709d31', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - 'e35fc73aa87bb27e10306900b15a18b0e9c7ca42', + '0c540fd5462a266277e86fa32a230cad4a859037', 'crashpad/third_party/libfuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + 'fda403cf93ecb8792cb1d061564d89a6553ca020', diff --git a/util/mac/launchd.mm b/util/mac/launchd.mm index c711747b..d295ffc6 100644 --- a/util/mac/launchd.mm +++ b/util/mac/launchd.mm @@ -130,7 +130,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) { base::apple::CFCastStrict(property_cf)); data_launch = LaunchDataNewOpaque([data_ns bytes], [data_ns length]); } else { - base::ScopedCFTypeRef type_name_cf( + base::apple::ScopedCFTypeRef type_name_cf( CFCopyTypeIDDescription(type_id_cf)); DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" << base::SysCFStringRefToUTF8(type_name_cf) << ")"; diff --git a/util/mac/mac_util.cc b/util/mac/mac_util.cc index f1898620..c74fbf36 100644 --- a/util/mac/mac_util.cc +++ b/util/mac/mac_util.cc @@ -166,7 +166,7 @@ bool StringToVersionNumbers(const std::string& version, std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry, CFStringRef key) { - base::ScopedCFTypeRef property( + base::apple::ScopedCFTypeRef property( IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0)); CFDataRef data = base::apple::CFCast(property); if (data && CFDataGetLength(data) > 0) { @@ -235,7 +235,7 @@ bool MacOSVersionComponents(int* major, int* bugfix, std::string* build, std::string* version_string) { - base::ScopedCFTypeRef dictionary( + base::apple::ScopedCFTypeRef dictionary( TryCFCopySystemVersionDictionary()); if (!dictionary) { LOG(ERROR) << "_CFCopySystemVersionDictionary failed";