| Index: ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm
|
| diff --git a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm
|
| index c195f46f55e75b3076259809f08b4069af0f5230..82f89888429952b3233beb48699ebfd192013a66 100644
|
| --- a/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm
|
| +++ b/ios/chrome/browser/geolocation/omnibox_geolocation_local_state.mm
|
| @@ -7,15 +7,18 @@
|
| #import <CoreLocation/CoreLocation.h>
|
|
|
| #include "base/logging.h"
|
| -#include "base/mac/scoped_nsobject.h"
|
| #include "components/prefs/pref_registry_simple.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "ios/chrome/browser/application_context.h"
|
| #import "ios/chrome/browser/geolocation/location_manager.h"
|
| #import "ios/chrome/browser/pref_names.h"
|
|
|
| +#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| +#error "This file requires ARC support."
|
| +#endif
|
| +
|
| @interface OmniboxGeolocationLocalState () {
|
| - base::scoped_nsobject<LocationManager> locationManager_;
|
| + LocationManager* _locationManager;
|
| }
|
|
|
| - (int)intForPath:(const char*)path;
|
| @@ -39,7 +42,7 @@
|
| DCHECK(locationManager);
|
| self = [super init];
|
| if (self) {
|
| - locationManager_.reset([locationManager retain]);
|
| + _locationManager = locationManager;
|
| }
|
| return self;
|
| }
|
| @@ -65,7 +68,7 @@
|
| break;
|
| }
|
|
|
| - switch ([locationManager_ authorizationStatus]) {
|
| + switch ([_locationManager authorizationStatus]) {
|
| case kCLAuthorizationStatusNotDetermined:
|
| // If the user previously authorized or denied geolocation but reset the
|
| // system settings, then start over.
|
|
|