Remove SyncService::IsFirstSetupComplete
It has been replaced by SyncUserSettings::IsFirstSetupComplete.
Note that *Profile*SyncService::IsFirstSetupComplete still exists for
now (it's used by SyncUserSettings). This will be changed in a later CL.
There were 3 remaining places that still used the SyncService version
of IsFirstSetupComplete; those are trivially migrated to
SyncUserSettings.
Bug: 884159
Change-Id: I90b29436986a7220803c61e2f2767c620e291e71
Reviewed-on: https://chromium-review.googlesource.com/c/1352785
Reviewed-by: Christian Dullweber <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Reviewed-by: Mohamed Amir Yosef <[email protected]>
Commit-Queue: Marc Treib <[email protected]>
Cr-Commit-Position: refs/heads/master@{#612091}diff --git a/components/sync/driver/sync_service.cc b/components/sync/driver/sync_service.cc
index 9e6fc23..67a9818 100644
--- a/components/sync/driver/sync_service.cc
+++ b/components/sync/driver/sync_service.cc
@@ -4,6 +4,8 @@
#include "components/sync/driver/sync_service.h"
+#include "components/sync/driver/sync_user_settings.h"
+
namespace syncer {
SyncSetupInProgressHandle::SyncSetupInProgressHandle(base::Closure on_destroy)
@@ -17,7 +19,7 @@
// Note: IsFirstSetupComplete() shouldn't usually be true if we don't have a
// primary account, but it could happen if the account changes from primary to
// secondary.
- return CanSyncFeatureStart() && IsFirstSetupComplete();
+ return CanSyncFeatureStart() && GetUserSettings()->IsFirstSetupComplete();
}
bool SyncService::CanSyncFeatureStart() const {
@@ -61,7 +63,7 @@
}
bool SyncService::IsFirstSetupInProgress() const {
- return !IsFirstSetupComplete() && IsSetupInProgress();
+ return !GetUserSettings()->IsFirstSetupComplete() && IsSetupInProgress();
}
bool SyncService::HasUnrecoverableError() const {
