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/1352785Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612091}

chrome/browser/sync_file_system/sync_file_system_service.cc

@@ -34,6 +34,7 @@
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/sync/driver/sync_service.h"
+#include "components/sync/driver/sync_user_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_prefs.h"
@@ -741,7 +742,7 @@ void SyncFileSystemService::OnFileStatusChanged(
 
 void SyncFileSystemService::UpdateSyncEnabledStatus(
     syncer::SyncService* profile_sync_service) {
-  if (!profile_sync_service->IsFirstSetupComplete())
+  if (!profile_sync_service->GetUserSettings()->IsFirstSetupComplete())
     return;
   bool old_sync_enabled = sync_enabled_;
   sync_enabled_ = profile_sync_service->GetActiveDataTypes().Has(

components/browser_sync/profile_sync_service.h

@@ -225,7 +225,7 @@ class ProfileSyncService : public syncer::SyncService,
   const syncer::SyncUserSettings* GetUserSettings() const override;
   int GetDisableReasons() const override;
   TransportState GetTransportState() const override;
-  bool IsFirstSetupComplete() const override;
+  virtual bool IsFirstSetupComplete() const;  // Virtual for testing.
   bool IsLocalSyncEnabled() const override;
   void TriggerRefresh(const syncer::ModelTypeSet& types) override;
   void OnDataTypeRequestsSyncStartup(syncer::ModelType type) override;

components/browsing_data/core/counters/autofill_counter.cc

@@ -14,11 +14,13 @@
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/sync/driver/sync_service.h"
+#include "components/sync/driver/sync_user_settings.h"
 
 namespace {
 
 bool IsAutofillSyncEnabled(const syncer::SyncService* sync_service) {
-  return sync_service && sync_service->IsFirstSetupComplete() &&
+  return sync_service &&
+         sync_service->GetUserSettings()->IsFirstSetupComplete() &&
          sync_service->IsSyncFeatureActive() &&
          sync_service->GetActiveDataTypes().Has(syncer::AUTOFILL);
 }

components/sync/driver/about_sync_util.cc

@@ -16,6 +16,7 @@
 #include "base/values.h"
 #include "components/sync/driver/sync_service.h"
 #include "components/sync/driver/sync_token_status.h"
+#include "components/sync/driver/sync_user_settings.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
 #include "components/sync/engine/sync_status.h"
 #include "components/sync/engine/sync_string_conversions.h"
@@ -483,7 +484,7 @@ std::unique_ptr<base::DictionaryValue> ConstructAboutInformation(
   // Local State.
   server_connection->Set(GetConnectionStatus(token_status));
   last_synced->Set(GetLastSyncedTimeString(service->GetLastSyncedTime()));
-  is_setup_complete->Set(service->IsFirstSetupComplete());
+  is_setup_complete->Set(service->GetUserSettings()->IsFirstSetupComplete());
   if (is_status_valid)
     is_syncing->Set(full_status.syncing);
   is_local_sync_enabled->Set(service->IsLocalSyncEnabled());

components/sync/driver/fake_sync_service.cc

@@ -43,10 +43,6 @@ bool FakeSyncService::IsAuthenticatedAccountPrimary() const {
   return true;
 }
 
-bool FakeSyncService::IsFirstSetupComplete() const {
-  return false;
-}
-
 bool FakeSyncService::IsLocalSyncEnabled() const {
   return false;
 }

components/sync/driver/fake_sync_service.h

@@ -30,7 +30,6 @@ class FakeSyncService : public SyncService {
   TransportState GetTransportState() const override;
   AccountInfo GetAuthenticatedAccountInfo() const override;
   bool IsAuthenticatedAccountPrimary() const override;
-  bool IsFirstSetupComplete() const override;
   bool IsLocalSyncEnabled() const override;
   void TriggerRefresh(const ModelTypeSet& types) override;
   ModelTypeSet GetActiveDataTypes() const override;

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 @@ bool SyncService::IsSyncFeatureEnabled() const {
   // 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::IsSyncFeatureActive() const {
 }
 
 bool SyncService::IsFirstSetupInProgress() const {
-  return !IsFirstSetupComplete() && IsSetupInProgress();
+  return !GetUserSettings()->IsFirstSetupComplete() && IsSetupInProgress();
 }
 
 bool SyncService::HasUnrecoverableError() const {

components/sync/driver/sync_service.h

@@ -216,14 +216,6 @@ class SyncService : public DataTypeEncryptionHandler, public KeyedService {
   // independent of first-setup state.
   bool IsFirstSetupInProgress() const;
 
-  // Whether the user has completed the initial Sync setup. This does not mean
-  // that sync is currently running (due to delayed startup, unrecoverable
-  // errors, or shutdown). If you want to know whether Sync is actually running,
-  // use GetTransportState or IsSyncFeatureActive instead.
-  // Note: This refers to Sync-the-feature. Sync-the-transport may be active
-  // independent of first-setup state.
-  virtual bool IsFirstSetupComplete() const = 0;
-
   //////////////////////////////////////////////////////////////////////////////
   // SETUP-IN-PROGRESS HANDLING
   //////////////////////////////////////////////////////////////////////////////

components/sync/driver/test_sync_service.cc

@@ -68,7 +68,7 @@ void TestSyncService::SetAuthError(const GoogleServiceAuthError& auth_error) {
 }
 
 void TestSyncService::SetFirstSetupComplete(bool first_setup_complete) {
-  first_setup_complete_ = first_setup_complete;
+  user_settings_.SetFirstSetupComplete(first_setup_complete);
 }
 
 void TestSyncService::SetPreferredDataTypes(const ModelTypeSet& types) {
@@ -127,10 +127,6 @@ const GoogleServiceAuthError& TestSyncService::GetAuthError() const {
   return auth_error_;
 }
 
-bool TestSyncService::IsFirstSetupComplete() const {
-  return first_setup_complete_;
-}
-
 std::unique_ptr<SyncSetupInProgressHandle>
 TestSyncService::GetSetupInProgressHandle() {
   return nullptr;

components/sync/driver/test_sync_service.h

@@ -51,8 +51,6 @@ class TestSyncService : public SyncService {
   bool IsAuthenticatedAccountPrimary() const override;
   const GoogleServiceAuthError& GetAuthError() const override;
 
-  bool IsFirstSetupComplete() const override;
-
   std::unique_ptr<SyncSetupInProgressHandle> GetSetupInProgressHandle()
       override;
   bool IsSetupInProgress() const override;
@@ -112,7 +110,6 @@ class TestSyncService : public SyncService {
   AccountInfo account_info_;
   bool account_is_primary_ = true;
   GoogleServiceAuthError auth_error_;
-  bool first_setup_complete_ = true;
 
   ModelTypeSet preferred_data_types_;
   ModelTypeSet active_data_types_;

components/sync/driver/test_sync_user_settings.cc

@@ -46,11 +46,11 @@ void TestSyncUserSettings::SetSyncAllowedByPlatform(bool allowed) {
 }
 
 bool TestSyncUserSettings::IsFirstSetupComplete() const {
-  return service_->IsFirstSetupComplete();
+  return first_setup_complete_;
 }
 
 void TestSyncUserSettings::SetFirstSetupComplete() {
-  service_->SetFirstSetupComplete(true);
+  SetFirstSetupComplete(true);
 }
 
 bool TestSyncUserSettings::IsSyncEverythingEnabled() const {
@@ -121,4 +121,8 @@ bool TestSyncUserSettings::SetDecryptionPassphrase(
   return service_->SetDecryptionPassphrase(passphrase);
 }
 
+void TestSyncUserSettings::SetFirstSetupComplete(bool first_setup_complete) {
+  first_setup_complete_ = first_setup_complete;
+}
+
 }  // namespace syncer

components/sync/driver/test_sync_user_settings.h

@@ -47,9 +47,12 @@ class TestSyncUserSettings : public SyncUserSettings {
   void SetEncryptionPassphrase(const std::string& passphrase) override;
   bool SetDecryptionPassphrase(const std::string& passphrase) override;
 
+  void SetFirstSetupComplete(bool first_setup_complete);
+
  private:
   TestSyncService* service_;
 
+  bool first_setup_complete_ = true;
   bool sync_everything_enabled_ = true;
 };