Chromium Code Reviews| Index: ios/chrome/app/safe_mode_crashing_modules_config.mm |
| diff --git a/ios/chrome/app/safe_mode_crashing_modules_config.mm b/ios/chrome/app/safe_mode_crashing_modules_config.mm |
| index e9ec67c4f1d437a1c26fc6be20a8bf5ff6a5cfeb..7fe9df810ca5c2c2a0e8ba402850190c8a9fb468 100644 |
| --- a/ios/chrome/app/safe_mode_crashing_modules_config.mm |
| +++ b/ios/chrome/app/safe_mode_crashing_modules_config.mm |
| @@ -6,7 +6,10 @@ |
| #include "base/logging.h" |
| #include "base/mac/foundation_util.h" |
| -#import "base/mac/scoped_nsobject.h" |
| + |
| +#if !defined(__has_feature) || !__has_feature(objc_arc) |
| +#error "This file requires ARC support." |
| +#endif |
| namespace { |
| @@ -16,7 +19,7 @@ NSString* const kModuleFriendlyNameKey = @"ModuleFriendlyName"; |
| } // namespace |
| @interface SafeModeCrashingModulesConfig () { |
|
sdefresne
2017/02/21 14:20:25
nit: move this to @implementation
stkhapugin
2017/02/21 15:47:02
Done.
|
| - base::scoped_nsobject<NSDictionary> _configuration; |
| + NSDictionary* _configuration; |
| } |
| @end |
| @@ -34,8 +37,7 @@ NSString* const kModuleFriendlyNameKey = @"ModuleFriendlyName"; |
| NSString* configPath = |
| [[NSBundle mainBundle] pathForResource:@"SafeModeCrashingModules" |
| ofType:@"plist"]; |
| - _configuration.reset( |
| - [[NSDictionary alloc] initWithContentsOfFile:configPath]); |
| + _configuration = [[NSDictionary alloc] initWithContentsOfFile:configPath]; |
| } |
| return self; |
| } |