Commit abeabb82 authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Moving from HasFinishedInitialSetup to IsFirstSetupComplete

HasFinishedInitialSetup() is expected to be removed and replaced by
IsFirstSetupComplete().
Replacing HasFinishedInitialSetup() in:
  + first_run_egtest.mm
  + settings_table_view_controller.mm

Bug: 951313
Change-Id: Id509a68e0bbb72702c7df8e3581f64c7996ccb51
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1833610Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707890}
parent f0ecb909
...@@ -196,7 +196,7 @@ id<GREYMatcher> SkipSigninButton() { ...@@ -196,7 +196,7 @@ id<GREYMatcher> SkipSigninButton() {
// Check Sync hasn't started yet, allowing the user to change some settings. // Check Sync hasn't started yet, allowing the user to change some settings.
SyncSetupService* sync_service = SyncSetupServiceFactory::GetForBrowserState( SyncSetupService* sync_service = SyncSetupServiceFactory::GetForBrowserState(
chrome_test_util::GetOriginalBrowserState()); chrome_test_util::GetOriginalBrowserState());
GREYAssertFalse(sync_service->HasFinishedInitialSetup(), GREYAssertFalse(sync_service->IsFirstSetupComplete(),
@"Sync shouldn't have finished its original setup yet"); @"Sync shouldn't have finished its original setup yet");
// Close Settings, user is still signed in and sync is now starting. // Close Settings, user is still signed in and sync is now starting.
...@@ -205,7 +205,7 @@ id<GREYMatcher> SkipSigninButton() { ...@@ -205,7 +205,7 @@ id<GREYMatcher> SkipSigninButton() {
[SigninEarlGreyUtils checkSignedInWithIdentity:identity]; [SigninEarlGreyUtils checkSignedInWithIdentity:identity];
GREYAssertTrue(sync_service->HasFinishedInitialSetup(), GREYAssertTrue(sync_service->IsFirstSetupComplete(),
@"Sync should have finished its original setup"); @"Sync should have finished its original setup");
} }
......
...@@ -1007,7 +1007,7 @@ NSString* kDevViewSourceKey = @"DevViewSource"; ...@@ -1007,7 +1007,7 @@ NSString* kDevViewSourceKey = @"DevViewSource";
IDS_IOS_GOOGLE_SERVICES_SETTINGS_SYNC_DISABLBED_BY_ADMINISTRATOR_STATUS); IDS_IOS_GOOGLE_SERVICES_SETTINGS_SYNC_DISABLBED_BY_ADMINISTRATOR_STATUS);
googleServicesItem.image = googleServicesItem.image =
[UIImage imageNamed:kSyncAndGoogleServicesSyncOffImageName]; [UIImage imageNamed:kSyncAndGoogleServicesSyncOffImageName];
} else if (!syncSetupService->HasFinishedInitialSetup()) { } else if (!syncSetupService->IsFirstSetupComplete()) {
googleServicesItem.detailText = googleServicesItem.detailText =
l10n_util::GetNSString(IDS_IOS_SYNC_SETUP_IN_PROGRESS); l10n_util::GetNSString(IDS_IOS_SYNC_SETUP_IN_PROGRESS);
googleServicesItem.image = googleServicesItem.image =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment