Remove kDoNotSyncFaviconDataTypes feature

The feature has been successfully enabled by default, so this CL removes
it, as well as the favicon cleanup logic for pseudo-USS introduced by
https://crrev.com/c/1917173.

Bug: 978775
Change-Id: I8539cda6166e6a03e434b9545278b7b6abda3a19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089823
Commit-Queue: Victor Vianna <victorvianna@google.com>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747687}

chrome/browser/sync/chrome_sync_client.cc

@@ -576,15 +576,6 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
                  : nullptr;
     }
 #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
-    case syncer::FAVICON_IMAGES:
-    case syncer::FAVICON_TRACKING:
-      if (!base::FeatureList::IsEnabled(switches::kDoNotSyncFaviconDataTypes)) {
-        return GetWeakPtrOrNull(
-            SessionSyncServiceFactory::GetForProfile(profile_)
-                ->GetFaviconCache());
-      }
-      NOTREACHED();
-      return nullptr;
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
     case syncer::SUPERVISED_USER_SETTINGS:
       return SupervisedUserSettingsServiceFactory::GetForKey(
@@ -610,9 +601,6 @@ ChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
           ->AsWeakPtr();
 #endif  // defined(OS_CHROMEOS)
     default:
-      // The following datatypes still need to be transitioned to the
-      // syncer::SyncableService API:
-      // Bookmarks
       NOTREACHED();
       return nullptr;
   }

chrome/browser/sync/profile_sync_service_factory_unittest.cc

@@ -111,10 +111,6 @@ class ProfileSyncServiceFactoryTest : public testing::Test {
     datatypes.push_back(syncer::AUTOFILL_WALLET_METADATA);
     datatypes.push_back(syncer::BOOKMARKS);
     datatypes.push_back(syncer::DEVICE_INFO);
-    if (!base::FeatureList::IsEnabled(switches::kDoNotSyncFaviconDataTypes)) {
-      datatypes.push_back(syncer::FAVICON_TRACKING);
-      datatypes.push_back(syncer::FAVICON_IMAGES);
-    }
     datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES);
     if (!base::FeatureList::IsEnabled(switches::kSyncUSSPasswords)) {
       // Password store factory is null for testing. For directory

components/browser_sync/profile_sync_components_factory_impl.cc

@@ -255,26 +255,6 @@ ProfileSyncComponentsFactoryImpl::CreateCommonDataTypeControllers(
                       .get()),
               history_disabled_pref_));
     }
-
-    // If |kDoNotSyncFaviconDataTypes| feature is enabled, never register
-    // controllers for favicon sync. Otherwise, it is enabled by default and we
-    // should register unless explicitly disabled.
-    if (!base::FeatureList::IsEnabled(switches::kDoNotSyncFaviconDataTypes) &&
-        !disabled_types.Has(syncer::FAVICON_IMAGES) &&
-        !disabled_types.Has(syncer::FAVICON_TRACKING)) {
-      controllers.push_back(
-          std::make_unique<SyncableServiceBasedModelTypeController>(
-              syncer::FAVICON_IMAGES,
-              sync_client_->GetModelTypeStoreService()->GetStoreFactory(),
-              sync_client_->GetSyncableServiceForType(syncer::FAVICON_IMAGES),
-              dump_stack));
-      controllers.push_back(
-          std::make_unique<SyncableServiceBasedModelTypeController>(
-              syncer::FAVICON_TRACKING,
-              sync_client_->GetModelTypeStoreService()->GetStoreFactory(),
-              sync_client_->GetSyncableServiceForType(syncer::FAVICON_TRACKING),
-              dump_stack));
-    }
   }
 
   // Password sync is enabled by default.  Register unless explicitly

components/sync/base/sync_base_switches.cc

@@ -23,7 +23,4 @@ const base::FeatureParam<int> kSyncSharingMessageNudgeDelayMilliseconds{
     &kSyncCustomSharingMessageNudgeDelay,
     "SyncSharingMessageNudgeDelayMilliseconds", 50};
 
-const base::Feature kDoNotSyncFaviconDataTypes{
-    "DoNotSyncFaviconDataTypes", base::FEATURE_ENABLED_BY_DEFAULT};
-
 }  // namespace switches

components/sync/base/sync_base_switches.h

@@ -14,7 +14,6 @@ extern const base::Feature kSyncForceDisableScryptForCustomPassphrase;
 extern const base::Feature kSyncE2ELatencyMeasurement;
 extern const base::Feature kSyncCustomSharingMessageNudgeDelay;
 extern const base::FeatureParam<int> kSyncSharingMessageNudgeDelayMilliseconds;
-extern const base::Feature kDoNotSyncFaviconDataTypes;
 
 }  // namespace switches
 

components/sync/model_impl/model_type_store_service_impl.cc

@@ -32,7 +32,6 @@ constexpr base::FilePath::CharType kLevelDBFolderName[] =
 
 // Initialized ModelTypeStoreBackend, on the backend sequence.
 void InitOnBackendSequence(const base::FilePath& level_db_path,
-                           bool do_not_sync_favicon_data_types,
                            scoped_refptr<ModelTypeStoreBackend> store_backend) {
   base::Optional<ModelError> error = store_backend->Init(level_db_path);
   if (error) {
@@ -41,12 +40,10 @@ void InitOnBackendSequence(const base::FilePath& level_db_path,
     return;
   }
 
+  // TODO(crbug.com/978775): Remove the cleanup logic after a year.
   // Clean up local data from deprecated datatypes.
-  if (do_not_sync_favicon_data_types) {
-    for (ModelType type : {FAVICON_IMAGES, FAVICON_TRACKING}) {
-      BlockingModelTypeStoreImpl(type, store_backend)
-          .DeleteAllDataAndMetadata();
-    }
+  for (ModelType type : {FAVICON_IMAGES, FAVICON_TRACKING}) {
+    BlockingModelTypeStoreImpl(type, store_backend).DeleteAllDataAndMetadata();
   }
 }
 
@@ -111,14 +108,8 @@ ModelTypeStoreServiceImpl::ModelTypeStoreServiceImpl(
           {base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})),
       store_backend_(ModelTypeStoreBackend::CreateUninitialized()) {
   DCHECK(backend_task_runner_);
-  // switches::kDoNotSyncFaviconDataTypes is evaluated here to avoid TSAN issues
-  // in tests.
-  // TODO(crbug.com/978775): Remove the feature as well as the cleanup logic
-  // after a few milestones, e.g. after M83.
   backend_task_runner_->PostTask(
       FROM_HERE, base::BindOnce(&InitOnBackendSequence, leveldb_path_,
-                                base::FeatureList::IsEnabled(
-                                    switches::kDoNotSyncFaviconDataTypes),
                                 store_backend_));
 }
 

ios/chrome/browser/sync/ios_chrome_sync_client.mm

@@ -231,18 +231,6 @@ IOSChromeSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
       return history ? history->GetDeleteDirectivesSyncableService()
                      : base::WeakPtr<syncer::SyncableService>();
     }
-    case syncer::FAVICON_IMAGES:
-    case syncer::FAVICON_TRACKING: {
-      if (!base::FeatureList::IsEnabled(switches::kDoNotSyncFaviconDataTypes)) {
-        sync_sessions::FaviconCache* favicons =
-            SessionSyncServiceFactory::GetForBrowserState(browser_state_)
-                ->GetFaviconCache();
-        return favicons ? favicons->AsWeakPtr()
-                        : base::WeakPtr<syncer::SyncableService>();
-      }
-      NOTREACHED();
-      return nullptr;
-    }
     case syncer::PASSWORDS: {
       return password_store_ ? password_store_->GetPasswordSyncableService()
                              : base::WeakPtr<syncer::SyncableService>();