[sync] Rename term 'secondary' with 'explicit' wrt passphrase
No behavioral changes, it's a fully automated replacement of the term.
The new name is consistent with other code like
syncer::IsExplicitPassphrase(). This logic returns true mainly for
custom passphrase users but also for the legacy
frozen-implicit-passphrase users (very similar to custom passphrase).
Change-Id: Id7ccbfaeef8fa995ca669e6040ef276bd18c0d3b
Bug: 1016715
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821541
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Reviewed-by: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#875102}
GitOrigin-RevId: 930e2af1d16616915d2190503be1ccee143e1b53
diff --git a/chrome/browser/ui/settings/sync/sync_create_passphrase_table_view_controller_unittest.mm b/chrome/browser/ui/settings/sync/sync_create_passphrase_table_view_controller_unittest.mm
index f76597c..6dbe1eb 100644
--- a/chrome/browser/ui/settings/sync/sync_create_passphrase_table_view_controller_unittest.mm
+++ b/chrome/browser/ui/settings/sync/sync_create_passphrase_table_view_controller_unittest.mm
@@ -186,10 +186,10 @@
ON_CALL(*fake_sync_service_->GetMockUserSettings(), IsPassphraseRequired())
.WillByDefault(Return(false));
ON_CALL(*fake_sync_service_->GetMockUserSettings(),
- IsUsingSecondaryPassphrase())
+ IsUsingExplicitPassphrase())
.WillByDefault(Return(true));
[sync_controller onSyncStateChanged];
- // Calling -onStateChanged with an accepted secondary passphrase should
+ // Calling -onStateChanged with an accepted explicit passphrase should
// cause the controller to be popped off the navigation stack.
EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
base::test::ios::kWaitForUIElementTimeout, ^bool() {
@@ -218,7 +218,7 @@
ON_CALL(*fake_sync_service_->GetMockUserSettings(), IsPassphraseRequired())
.WillByDefault(Return(false));
ON_CALL(*fake_sync_service_->GetMockUserSettings(),
- IsUsingSecondaryPassphrase())
+ IsUsingExplicitPassphrase())
.WillByDefault(Return(false));
[sync_controller onSyncStateChanged];
EXPECT_EQ([nav_controller_ topViewController], sync_controller);
diff --git a/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller.mm b/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller.mm
index e16f33f..c48da3a 100644
--- a/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller.mm
+++ b/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller.mm
@@ -101,7 +101,7 @@
syncer::SyncService* service =
ProfileSyncServiceFactory::GetForBrowserState(browserState);
if (service->IsEngineInitialized() &&
- service->GetUserSettings()->IsUsingSecondaryPassphrase()) {
+ service->GetUserSettings()->IsUsingExplicitPassphrase()) {
base::Time passphrase_time =
service->GetUserSettings()->GetExplicitPassphraseTime();
if (!passphrase_time.is_null()) {
@@ -495,7 +495,7 @@
// Checking if the operation succeeded.
if (!service->GetUserSettings()->IsPassphraseRequired() &&
- (service->GetUserSettings()->IsUsingSecondaryPassphrase() ||
+ (service->GetUserSettings()->IsUsingExplicitPassphrase() ||
[self forDecryption])) {
_syncObserver.reset();
SettingsNavigationController* settingsNavigationController =
diff --git a/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller_unittest.mm b/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller_unittest.mm
index f97bc11..e2cab04 100644
--- a/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller_unittest.mm
+++ b/chrome/browser/ui/settings/sync/sync_encryption_passphrase_table_view_controller_unittest.mm
@@ -189,10 +189,10 @@
ON_CALL(*fake_sync_service_->GetMockUserSettings(), IsPassphraseRequired())
.WillByDefault(Return(false));
ON_CALL(*fake_sync_service_->GetMockUserSettings(),
- IsUsingSecondaryPassphrase())
+ IsUsingExplicitPassphrase())
.WillByDefault(Return(true));
[sync_controller onSyncStateChanged];
- // Calling -onStateChanged with an accepted secondary passphrase should
+ // Calling -onStateChanged with an accepted explicit passphrase should
// cause the controller to be popped off the navigation stack.
EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
base::test::ios::kWaitForUIElementTimeout, ^bool() {
diff --git a/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller.mm b/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller.mm
index ba2c437..71d8b20 100644
--- a/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller.mm
+++ b/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller.mm
@@ -57,7 +57,7 @@
@interface SyncEncryptionTableViewController () <SyncObserverModelBridge,
SettingsControllerProtocol> {
std::unique_ptr<SyncObserverBridge> _syncObserver;
- BOOL _isUsingSecondaryPassphrase;
+ BOOL _isUsingExplicitPassphrase;
}
@property(nonatomic, assign, readonly) Browser* browser;
@@ -78,9 +78,9 @@
self.title = l10n_util::GetNSString(IDS_IOS_SYNC_ENCRYPTION_TITLE);
syncer::SyncService* syncService =
ProfileSyncServiceFactory::GetForBrowserState(browserState);
- _isUsingSecondaryPassphrase =
+ _isUsingExplicitPassphrase =
syncService->IsEngineInitialized() &&
- syncService->GetUserSettings()->IsUsingSecondaryPassphrase();
+ syncService->GetUserSettings()->IsUsingExplicitPassphrase();
_syncObserver = std::make_unique<SyncObserverBridge>(self, syncService);
}
return self;
@@ -105,7 +105,7 @@
[model addItem:[self passphraseItem]
toSectionWithIdentifier:SectionIdentifierEncryption];
- if (_isUsingSecondaryPassphrase) {
+ if (_isUsingExplicitPassphrase) {
[model setFooter:[self footerItem]
forSectionWithIdentifier:SectionIdentifierEncryption];
}
@@ -119,8 +119,8 @@
NSString* text = l10n_util::GetNSString(IDS_SYNC_BASIC_ENCRYPTION_DATA);
return [self itemWithType:ItemTypeAccount
text:text
- checked:!_isUsingSecondaryPassphrase
- enabled:!_isUsingSecondaryPassphrase];
+ checked:!_isUsingExplicitPassphrase
+ enabled:!_isUsingExplicitPassphrase];
}
// Returns a passphrase item.
@@ -129,8 +129,8 @@
NSString* text = l10n_util::GetNSString(IDS_SYNC_FULL_ENCRYPTION_DATA);
return [self itemWithType:ItemTypePassphrase
text:text
- checked:_isUsingSecondaryPassphrase
- enabled:!_isUsingSecondaryPassphrase];
+ checked:_isUsingExplicitPassphrase
+ enabled:!_isUsingExplicitPassphrase];
}
// Returns a footer item with a link.
@@ -177,7 +177,7 @@
syncer::SyncService* service =
ProfileSyncServiceFactory::GetForBrowserState(browserState);
if (service->IsEngineInitialized() &&
- !service->GetUserSettings()->IsUsingSecondaryPassphrase()) {
+ !service->GetUserSettings()->IsUsingExplicitPassphrase()) {
SyncCreatePassphraseTableViewController* controller =
[[SyncCreatePassphraseTableViewController alloc]
initWithBrowser:self.browser];
@@ -221,11 +221,11 @@
ChromeBrowserState* browserState = self.browser->GetBrowserState();
syncer::SyncService* service =
ProfileSyncServiceFactory::GetForBrowserState(browserState);
- BOOL isNowUsingSecondaryPassphrase =
+ BOOL isNowUsingExplicitPassphrase =
service->IsEngineInitialized() &&
- service->GetUserSettings()->IsUsingSecondaryPassphrase();
- if (_isUsingSecondaryPassphrase != isNowUsingSecondaryPassphrase) {
- _isUsingSecondaryPassphrase = isNowUsingSecondaryPassphrase;
+ service->GetUserSettings()->IsUsingExplicitPassphrase();
+ if (_isUsingExplicitPassphrase != isNowUsingExplicitPassphrase) {
+ _isUsingExplicitPassphrase = isNowUsingExplicitPassphrase;
[self reloadData];
}
}
diff --git a/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller_unittest.mm b/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller_unittest.mm
index 0f78711..3fb2cd7 100644
--- a/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller_unittest.mm
+++ b/chrome/browser/ui/settings/sync/sync_encryption_table_view_controller_unittest.mm
@@ -47,7 +47,7 @@
syncer::TestSyncService* test_sync_service =
static_cast<syncer::TestSyncService*>(
ProfileSyncServiceFactory::GetForBrowserState(browserState));
- test_sync_service->SetIsUsingSecondaryPassphrase(true);
+ test_sync_service->SetIsUsingExplicitPassphrase(true);
CreateController();
}
diff --git a/web_view/internal/sync/cwv_sync_controller_unittest.mm b/web_view/internal/sync/cwv_sync_controller_unittest.mm
index 70157c8..346aa05 100644
--- a/web_view/internal/sync/cwv_sync_controller_unittest.mm
+++ b/web_view/internal/sync/cwv_sync_controller_unittest.mm
@@ -87,7 +87,7 @@
// Preconfigure TestSyncService as if it was enabled in transport mode.
sync_service_.SetFirstSetupComplete(false);
sync_service_.SetTransportState(syncer::SyncService::TransportState::ACTIVE);
- sync_service_.SetIsUsingSecondaryPassphrase(false);
+ sync_service_.SetIsUsingExplicitPassphrase(false);
sync_service_.SetAuthenticatedAccountInfo(account_info);
CWVSyncController* sync_controller = [[CWVSyncController alloc]
