ios/chrome/browser/ui/settings/settings_collection_view_controller.mm - Issue 2813223002: [ObjC ARC] Converts ios/chrome/browser/ui/settings:settings to ARC.

Unified Diff: ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

Issue 2813223002: [ObjC ARC] Converts ios/chrome/browser/ui/settings:settings to ARC. (Closed)

Patch Set: reabse Created 3 years, 7 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

« no previous file with comments | « ios/chrome/browser/ui/settings/settings_collection_view_controller.h ('k') | ios/chrome/browser/ui/settings/settings_navigation_controller.mm » ('j') | ios/chrome/browser/ui/settings/sync_encryption_passphrase_collection_view_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

index b9ba1e53a40554a28a582330028ffe09f15fdf45..fde81909410855d1bbc5fd6083612db21e8d8d94 100644

--- a/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

+++ b/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

@@ -6,9 +6,7 @@

#include <memory>

-#import "base/ios/weak_nsobject.h"

#import "base/mac/foundation_util.h"

-#import "base/mac/scoped_nsobject.h"

#include "base/metrics/user_metrics.h"

#include "base/scoped_observer.h"

#include "base/strings/sys_string_conversions.h"

@@ -75,8 +73,13 @@

#import "ios/public/provider/chrome/browser/signin/chrome_identity.h"

#import "ios/public/provider/chrome/browser/signin/signin_resources_provider.h"

#include "ios/public/provider/chrome/browser/voice/voice_search_prefs.h"

+#import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"

#include "ui/base/l10n/l10n_util_mac.h"

+#if !defined(__has_feature) || !__has_feature(objc_arc)

+#error "This file requires ARC support."

+#endif

NSString* const kSettingsCollectionViewId = @"kSettingsCollectionViewId";

NSString* const kSettingsSignInCellId = @"kSettingsSignInCellId";

NSString* const kSettingsAccountCellId = @"kSettingsAccountCellId";

@@ -143,7 +146,7 @@ class SigninObserverBridge : public SigninManagerBase::Observer {

const std::string& username) override;

private:

- base::WeakNSObject<SettingsCollectionViewController> owner_;

+ __weak SettingsCollectionViewController* owner_;

ScopedObserver<SigninManager, SigninObserverBridge> observer_;

};

@@ -188,25 +191,24 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

ios::ChromeBrowserState* _currentBrowserState; // weak

std::unique_ptr<SigninObserverBridge> _notificationBridge;

std::unique_ptr<SyncObserverBridge> _syncObserverBridge;

- base::scoped_nsobject<SigninInteractionController>

- _signinInteractionController;

+ SigninInteractionController* _signinInteractionController;

// Whether the impression of the Signin button has already been recorded.

BOOL _hasRecordedSigninImpression;

// PrefBackedBoolean for ShowMemoryDebugTools switch.

- base::scoped_nsobject<PrefBackedBoolean> _showMemoryDebugToolsEnabled;

+ PrefBackedBoolean* _showMemoryDebugToolsEnabled;

// The item related to the switch for the show suggestions setting.

- base::scoped_nsobject<CollectionViewSwitchItem> _showMemoryDebugToolsItem;

+ CollectionViewSwitchItem* _showMemoryDebugToolsItem;

// Mediator to configure the sign-in promo cell. Also used to received

// identity update notifications.

- base::scoped_nsobject<SigninPromoViewMediator> _signinPromoViewMediator;

+ SigninPromoViewMediator* _signinPromoViewMediator;

// Cached resized profile image.

- base::scoped_nsobject<UIImage> _resizedImage;

- base::WeakNSObject<UIImage> _oldImage;

+ UIImage* _resizedImage;

+ __weak UIImage* _oldImage;

// Identity object and observer used for Account Item refresh.

- base::scoped_nsobject<ChromeIdentity> _identity;

+ ChromeIdentity* _identity;

std::unique_ptr<ChromeIdentityServiceObserverBridge> _identityServiceObserver;

// PrefMember for voice locale code.

@@ -219,10 +221,10 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

PrefChangeRegistrar _prefChangeRegistrar;

// Updatable Items.

- base::scoped_nsobject<CollectionViewDetailItem> _voiceSearchDetailItem;

- base::scoped_nsobject<CollectionViewDetailItem> _defaultSearchEngineItem;

- base::scoped_nsobject<CollectionViewDetailItem> _savePasswordsDetailItem;

- base::scoped_nsobject<CollectionViewDetailItem> _autoFillDetailItem;

+ CollectionViewDetailItem* _voiceSearchDetailItem;

+ CollectionViewDetailItem* _defaultSearchEngineItem;

+ CollectionViewDetailItem* _savePasswordsDetailItem;

+ CollectionViewDetailItem* _autoFillDetailItem;

}

// Stops observing browser state services. This is required during the shutdown

@@ -255,14 +257,14 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

_mainBrowserState);

_syncObserverBridge.reset(new SyncObserverBridge(self, syncService));

- _showMemoryDebugToolsEnabled.reset([[PrefBackedBoolean alloc]

+ _showMemoryDebugToolsEnabled = [[PrefBackedBoolean alloc]

initWithPrefService:GetApplicationContext()->GetLocalState()

- prefName:prefs::kShowMemoryDebuggingTools]);

+ prefName:prefs::kShowMemoryDebuggingTools];

[_showMemoryDebugToolsEnabled setObserver:self];

AuthenticationService* authService =

AuthenticationServiceFactory::GetForBrowserState(_mainBrowserState);

- _identity.reset([authService->GetAuthenticatedIdentity() retain]);

+ _identity = authService->GetAuthenticatedIdentity();

_identityServiceObserver.reset(

new ChromeIdentityServiceObserverBridge(self));

@@ -289,7 +291,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

- (void)dealloc {

[self stopBrowserStateServiceObservers];

- [super dealloc];

}

- (void)stopBrowserStateServiceObservers {

@@ -333,21 +334,21 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

_hasRecordedSigninImpression = YES;

}

if (experimental_flags::IsSigninPromoEnabled()) {

- _signinPromoViewMediator.reset([[SigninPromoViewMediator alloc] init]);

- _signinPromoViewMediator.get().consumer = self;

+ _signinPromoViewMediator = [[SigninPromoViewMediator alloc] init];

+ _signinPromoViewMediator.consumer = self;

}

[model addItem:[self signInTextItem]

toSectionWithIdentifier:SectionIdentifierSignIn];

} else {

- _signinPromoViewMediator.reset(nil);

+ _signinPromoViewMediator = nil;

[model addItem:[self accountCellItem]

toSectionWithIdentifier:SectionIdentifierSignIn];

}

// Basics section

[model addSectionWithIdentifier:SectionIdentifierBasics];

- CollectionViewTextItem* basicsHeader = [

- [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease];

+ CollectionViewTextItem* basicsHeader =

+ [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader];

basicsHeader.text = l10n_util::GetNSString(IDS_IOS_OPTIONS_GENERAL_TAB_LABEL);

basicsHeader.textColor = [[MDCPalette greyPalette] tint500];

[model setHeader:basicsHeader

@@ -365,8 +366,8 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

// Advanced Section

[model addSectionWithIdentifier:SectionIdentifierAdvanced];

- CollectionViewTextItem* advancedHeader = [

- [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader] autorelease];

+ CollectionViewTextItem* advancedHeader =

+ [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader];

advancedHeader.text =

l10n_util::GetNSString(IDS_IOS_OPTIONS_ADVANCED_TAB_LABEL);

advancedHeader.textColor = [[MDCPalette greyPalette] tint500];

@@ -389,8 +390,8 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

// Debug Section

if ([self hasDebugSection]) {

[model addSectionWithIdentifier:SectionIdentifierDebug];

- CollectionViewTextItem* debugHeader = [[[CollectionViewTextItem alloc]

- initWithType:ItemTypeHeader] autorelease];

+ CollectionViewTextItem* debugHeader =

+ [[CollectionViewTextItem alloc] initWithType:ItemTypeHeader];

debugHeader.text = @"Debug";

debugHeader.textColor = [[MDCPalette greyPalette] tint500];

[model setHeader:debugHeader

@@ -398,7 +399,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

}

if (experimental_flags::IsMemoryDebuggingEnabled()) {

- _showMemoryDebugToolsItem.reset([[self showMemoryDebugSwitchItem] retain]);

+ _showMemoryDebugToolsItem = [self showMemoryDebugSwitchItem];

[model addItem:_showMemoryDebugToolsItem

toSectionWithIdentifier:SectionIdentifierDebug];

}

@@ -419,15 +420,15 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

- (CollectionViewItem*)signInTextItem {

if (experimental_flags::IsSigninPromoEnabled()) {

- DCHECK(_signinPromoViewMediator.get());

- SigninPromoItem* signinPromoItem = [

- [[SigninPromoItem alloc] initWithType:ItemTypeSigninPromo] autorelease];

+ DCHECK(_signinPromoViewMediator);

+ SigninPromoItem* signinPromoItem =

+ [[SigninPromoItem alloc] initWithType:ItemTypeSigninPromo];

signinPromoItem.configurator =

[_signinPromoViewMediator createConfigurator];

return signinPromoItem;

}

- AccountSignInItem* signInTextItem = [[[AccountSignInItem alloc]

- initWithType:ItemTypeSignInButton] autorelease];

+ AccountSignInItem* signInTextItem =

+ [[AccountSignInItem alloc] initWithType:ItemTypeSignInButton];

signInTextItem.accessibilityIdentifier = kSettingsSignInCellId;

UIImage* image = CircularImageFromImage(ios::GetChromeBrowserProvider()

->GetSigninResourcesProvider()

@@ -439,8 +440,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

- (CollectionViewItem*)accountCellItem {

CollectionViewAccountItem* identityAccountItem =

- [[[CollectionViewAccountItem alloc] initWithType:ItemTypeAccount]

- autorelease];

+ [[CollectionViewAccountItem alloc] initWithType:ItemTypeAccount];

identityAccountItem.accessoryType =

MDCCollectionViewCellAccessoryDisclosureIndicator;

identityAccountItem.accessibilityIdentifier = kSettingsAccountCellId;

@@ -454,12 +454,12 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

ios::TemplateURLServiceFactory::GetForBrowserState(

_mainBrowserState)));

- _defaultSearchEngineItem.reset(

- [[self detailItemWithType:ItemTypeSearchEngine

- text:l10n_util::GetNSString(

- IDS_IOS_SEARCH_ENGINE_SETTING_TITLE)

- detailText:defaultSearchEngineName] retain]);

- _defaultSearchEngineItem.get().accessibilityIdentifier =

+ _defaultSearchEngineItem =

+ [self detailItemWithType:ItemTypeSearchEngine

+ text:l10n_util::GetNSString(

+ IDS_IOS_SEARCH_ENGINE_SETTING_TITLE)

+ detailText:defaultSearchEngineName];

+ _defaultSearchEngineItem.accessibilityIdentifier =

kSettingsSearchEngineCellId;

return _defaultSearchEngineItem;

}

@@ -471,10 +471,10 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

? l10n_util::GetNSString(IDS_IOS_SETTING_ON)

: l10n_util::GetNSString(IDS_IOS_SETTING_OFF);

- _savePasswordsDetailItem.reset(

- [[self detailItemWithType:ItemTypeSavedPasswords

- text:l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS)

- detailText:passwordsDetail] retain]);

+ _savePasswordsDetailItem =

+ [self detailItemWithType:ItemTypeSavedPasswords

+ text:l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS)

+ detailText:passwordsDetail];

return _savePasswordsDetailItem;

}

@@ -485,10 +485,10 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

NSString* autofillDetail = autofillEnabled

? l10n_util::GetNSString(IDS_IOS_SETTING_ON)

: l10n_util::GetNSString(IDS_IOS_SETTING_OFF);

- _autoFillDetailItem.reset(

- [[self detailItemWithType:ItemTypeAutofill

- text:l10n_util::GetNSString(IDS_IOS_AUTOFILL)

- detailText:autofillDetail] retain]);

+ _autoFillDetailItem =

+ [self detailItemWithType:ItemTypeAutofill

+ text:l10n_util::GetNSString(IDS_IOS_AUTOFILL)

+ detailText:autofillDetail];

return _autoFillDetailItem;

}

@@ -508,13 +508,12 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

? localeConfig->GetLocaleForCode(_voiceLocaleCode.GetValue())

: localeConfig->GetDefaultLocale();

NSString* languageName = base::SysUTF16ToNSString(locale.display_name);

- _voiceSearchDetailItem.reset(

- [[self detailItemWithType:ItemTypeVoiceSearch

- text:l10n_util::GetNSString(

- IDS_IOS_VOICE_SEARCH_SETTING_TITLE)

- detailText:languageName] retain]);

- _voiceSearchDetailItem.get().accessibilityIdentifier =

- kSettingsVoiceSearchCellId;

+ _voiceSearchDetailItem =

+ [self detailItemWithType:ItemTypeVoiceSearch

+ text:l10n_util::GetNSString(

+ IDS_IOS_VOICE_SEARCH_SETTING_TITLE)

+ detailText:languageName];

+ _voiceSearchDetailItem.accessibilityIdentifier = kSettingsVoiceSearchCellId;

return _voiceSearchDetailItem;

}

@@ -590,7 +589,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

ios::TemplateURLServiceFactory::GetForBrowserState(

_mainBrowserState)));

- _defaultSearchEngineItem.get().detailText = defaultSearchEngineName;

+ _defaultSearchEngineItem.detailText = defaultSearchEngineName;

[self reconfigureCellsForItems:@[ _defaultSearchEngineItem ]];

}

@@ -600,7 +599,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

text:(NSString*)text

detailText:(NSString*)detailText {

CollectionViewDetailItem* detailItem =

- [[[CollectionViewDetailItem alloc] initWithType:type] autorelease];

+ [[CollectionViewDetailItem alloc] initWithType:type];

detailItem.text = text;

detailItem.detailText = detailText;

detailItem.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;

@@ -613,7 +612,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

title:(NSString*)title

withDefaultsKey:(NSString*)key {

CollectionViewSwitchItem* switchItem =

- [[[CollectionViewSwitchItem alloc] initWithType:type] autorelease];

+ [[CollectionViewSwitchItem alloc] initWithType:type];

switchItem.text = title;

if (key) {

NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];

@@ -738,53 +737,53 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

NSInteger itemType =

[self.collectionViewModel itemTypeForIndexPath:indexPath];

- base::scoped_nsobject<UIViewController> controller;

+ UIViewController* controller;

switch (itemType) {

case ItemTypeSignInButton:

[self showSignInWithIdentity:nil];

break;

case ItemTypeAccount:

- controller.reset([[AccountsCollectionViewController alloc]

+ controller = [[AccountsCollectionViewController alloc]

initWithBrowserState:_mainBrowserState

- closeSettingsOnAddAccount:NO]);

+ closeSettingsOnAddAccount:NO];

break;

case ItemTypeSearchEngine:

- controller.reset([[SearchEngineSettingsCollectionViewController alloc]

- initWithBrowserState:_mainBrowserState]);

+ controller = [[SearchEngineSettingsCollectionViewController alloc]

+ initWithBrowserState:_mainBrowserState];

break;

case ItemTypeSavedPasswords: {

- controller.reset([[SavePasswordsCollectionViewController alloc]

- initWithBrowserState:_mainBrowserState]);

+ controller = [[SavePasswordsCollectionViewController alloc]

+ initWithBrowserState:_mainBrowserState];

break;

}

case ItemTypeAutofill:

- controller.reset([[AutofillCollectionViewController alloc]

- initWithBrowserState:_mainBrowserState]);

+ controller = [[AutofillCollectionViewController alloc]

+ initWithBrowserState:_mainBrowserState];

break;

case ItemTypeNativeApps:

- controller.reset([[NativeAppsCollectionViewController alloc]

+ controller = [[NativeAppsCollectionViewController alloc]

initWithURLRequestContextGetter:_currentBrowserState

- ->GetRequestContext()]);

+ ->GetRequestContext()];

break;

case ItemTypeVoiceSearch:

- controller.reset([[VoicesearchCollectionViewController alloc]

- initWithPrefs:_mainBrowserState->GetPrefs()]);

+ controller = [[VoicesearchCollectionViewController alloc]

+ initWithPrefs:_mainBrowserState->GetPrefs()];

break;

case ItemTypePrivacy:

- controller.reset([[PrivacyCollectionViewController alloc]

- initWithBrowserState:_mainBrowserState]);

+ controller = [[PrivacyCollectionViewController alloc]

+ initWithBrowserState:_mainBrowserState];

break;

case ItemTypeContentSettings:

- controller.reset([[ContentSettingsCollectionViewController alloc]

- initWithBrowserState:_mainBrowserState]);

+ controller = [[ContentSettingsCollectionViewController alloc]

+ initWithBrowserState:_mainBrowserState];

break;

case ItemTypeBandwidth:

- controller.reset([[BandwidthManagementCollectionViewController alloc]

- initWithBrowserState:_mainBrowserState]);

+ controller = [[BandwidthManagementCollectionViewController alloc]

+ initWithBrowserState:_mainBrowserState];

break;

case ItemTypeAboutChrome:

- controller.reset([[AboutChromeCollectionViewController alloc] init]);

+ controller = [[AboutChromeCollectionViewController alloc] init];

break;

case ItemTypeMemoryDebugging:

case ItemTypeViewSource:

@@ -794,7 +793,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

// and only the switch is tappable.

break;

case ItemTypeCellCatalog:

- controller.reset([[MaterialCellCatalogViewController alloc] init]);

+ controller = [[MaterialCellCatalogViewController alloc] init];

break;

default:

break;

@@ -933,7 +932,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

(CollectionViewAccountItem*)identityAccountItem {

AuthenticationService* authService =

AuthenticationServiceFactory::GetForBrowserState(_mainBrowserState);

- _identity.reset([authService->GetAuthenticatedIdentity() retain]);

+ _identity = authService->GetAuthenticatedIdentity();

if (!_identity) {

// This could occur during the sign out process. Just ignore as the account

// cell will be replaced by the "Sign in" button.

@@ -990,14 +989,14 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

- (void)showSignInWithIdentity:(ChromeIdentity*)identity {

base::RecordAction(base::UserMetricsAction("Signin_Signin_FromSettings"));

DCHECK(!_signinInteractionController);

- _signinInteractionController.reset([[SigninInteractionController alloc]

+ _signinInteractionController = [[SigninInteractionController alloc]

initWithBrowserState:_mainBrowserState

presentingViewController:self.navigationController

isPresentedOnSettings:YES

accessPoint:signin_metrics::AccessPoint::

- ACCESS_POINT_SETTINGS]);

+ ACCESS_POINT_SETTINGS];

- base::WeakNSObject<SettingsCollectionViewController> weakSelf(self);

+ __weak SettingsCollectionViewController* weakSelf = self;

[_signinInteractionController

signInWithViewController:self

identity:identity

@@ -1007,11 +1006,11 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

}

- (void)didFinishSignin:(BOOL)signedIn {

- _signinInteractionController.reset();

+ _signinInteractionController = nil;

}

- (void)signinPromoPrimaryAction:(id)unused {

- ChromeIdentity* identity = _signinPromoViewMediator.get().defaultIdentity;

+ ChromeIdentity* identity = _signinPromoViewMediator.defaultIdentity;

if (identity) {

base::RecordAction(

base::UserMetricsAction("Signin_SigninWithDefault_FromSettings"));

@@ -1023,7 +1022,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

}

- (void)signinPromoSecondaryAction:(id)unused {

- DCHECK(_signinPromoViewMediator.get().defaultIdentity);

+ DCHECK(_signinPromoViewMediator.defaultIdentity);

base::RecordAction(

base::UserMetricsAction("Signin_SigninNotDefault_FromSettings"));

[self showSignInWithIdentity:nil];

@@ -1070,10 +1069,10 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

}

// If the currently used image has already been resized, use it.

- if (_resizedImage && _oldImage.get() == image)

+ if (_resizedImage && _oldImage == image)

return _resizedImage;

- _oldImage.reset(image);

+ _oldImage = image;

// Resize the profile image.

CGFloat dimension = kAccountProfilePhotoDimension;

@@ -1081,7 +1080,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

image = ResizeImage(image, CGSizeMake(dimension, dimension),

ProjectionMode::kAspectFit);

}

- _resizedImage.reset([image retain]);

+ _resizedImage = image;

return _resizedImage;

}

@@ -1100,9 +1099,9 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

#pragma mark - BooleanObserver

- (void)booleanDidChange:(id<ObservableBoolean>)observableBoolean {

- DCHECK_EQ(observableBoolean, _showMemoryDebugToolsEnabled.get());

+ DCHECK_EQ(observableBoolean, _showMemoryDebugToolsEnabled);

// Update the Item.

- _showMemoryDebugToolsItem.get().on = [_showMemoryDebugToolsEnabled value];

+ _showMemoryDebugToolsItem.on = [_showMemoryDebugToolsEnabled value];

// Update the Cell.

[self reconfigureCellsForItems:@[ _showMemoryDebugToolsItem ]];

@@ -1119,7 +1118,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

? localeConfig->GetLocaleForCode(_voiceLocaleCode.GetValue())

: localeConfig->GetDefaultLocale();

NSString* languageName = base::SysUTF16ToNSString(locale.display_name);

- _voiceSearchDetailItem.get().detailText = languageName;

+ _voiceSearchDetailItem.detailText = languageName;

[self reconfigureCellsForItems:@[ _voiceSearchDetailItem ]];

}

@@ -1131,7 +1130,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

savePasswordsEnabled ? l10n_util::GetNSString(IDS_IOS_SETTING_ON)

: l10n_util::GetNSString(IDS_IOS_SETTING_OFF);

- _savePasswordsDetailItem.get().detailText = passwordsDetail;

+ _savePasswordsDetailItem.detailText = passwordsDetail;

[self reconfigureCellsForItems:@[ _savePasswordsDetailItem ]];

}

@@ -1141,7 +1140,7 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,

NSString* autofillDetail =

autofillEnabled ? l10n_util::GetNSString(IDS_IOS_SETTING_ON)

: l10n_util::GetNSString(IDS_IOS_SETTING_OFF);

- _autoFillDetailItem.get().detailText = autofillDetail;

+ _autoFillDetailItem.detailText = autofillDetail;

[self reconfigureCellsForItems:@[ _autoFillDetailItem ]];

}