summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/about_flags.cc7
-rw-r--r--chrome/browser/prefs/command_line_pref_store.cc1
-rw-r--r--chrome/browser/sync/profile_sync_components_factory_impl.cc15
-rw-r--r--chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc2
-rw-r--r--chrome/browser/sync/profile_sync_service.cc3
-rw-r--r--chrome/browser/sync/sync_prefs.cc6
-rw-r--r--chrome/browser/sync/test/integration/enable_disable_test.cc8
-rw-r--r--chrome/common/chrome_switches.cc9
-rw-r--r--chrome/common/chrome_switches.h1
-rw-r--r--chrome/common/pref_names.cc3
-rw-r--r--chrome/common/pref_names.h2
-rw-r--r--sync/internal_api/public/util/experiments.h16
-rw-r--r--sync/internal_api/sync_manager_impl.cc11
13 files changed, 17 insertions, 67 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 52d6b4f..477d28f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -685,13 +685,6 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions)
},
{
- "enable-sync-favicons",
- IDS_FLAGS_ENABLE_SYNC_FAVICONS_NAME,
- IDS_FLAGS_ENABLE_SYNC_FAVICONS_DESCRIPTION,
- kOsAll,
- SINGLE_VALUE_TYPE(switches::kEnableSyncFavicons)
- },
- {
"enable-gesture-tap-highlight",
IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME,
IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION,
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index dcdcd3f..f600683 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -74,7 +74,6 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
prefs::kDisableCloudPolicyOnSignin, true },
{ switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false },
{ switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true },
- { switches::kEnableSyncFavicons, prefs::kSyncFaviconsEnabled, false },
};
const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 8a4cbec..4ba8068 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -174,19 +174,8 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
new SessionDataTypeController(this, profile_, pss));
}
- // Migrate sync flags that should be prefs.
- // TODO(pastarmovj): Remove this code once enough time has passed to not need
- // to migrate anymore.
- about_flags::PrefServiceFlagsStorage flags_storage(
- g_browser_process->local_state());
- if (command_line_->HasSwitch(switches::kEnableSyncFavicons)) {
- profile_->GetPrefs()->SetBoolean(prefs::kSyncFaviconsEnabled, true);
- about_flags::SetExperimentEnabled(&flags_storage,
- syncer::kFaviconSyncFlag,
- false);
- }
-
- if (profile_->GetPrefs()->GetBoolean(prefs::kSyncFaviconsEnabled)) {
+ // Favicon sync is enabled by default. Register unless explicitly disabled.
+ if (!command_line_->HasSwitch(switches::kDisableSyncFavicons)) {
pss->RegisterDataTypeController(
new UIDataTypeController(syncer::FAVICON_IMAGES,
this,
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
index a32eb8af..df209b2 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
@@ -52,6 +52,8 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test {
datatypes.push_back(syncer::PROXY_TABS);
datatypes.push_back(syncer::THEMES);
datatypes.push_back(syncer::TYPED_URLS);
+ datatypes.push_back(syncer::FAVICON_TRACKING);
+ datatypes.push_back(syncer::FAVICON_IMAGES);
return datatypes;
}
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index b6ee96a..3c07979 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1020,9 +1020,6 @@ void ProfileSyncService::OnExperimentsChanged(
}
}
- if (experiments.favicon_sync)
- profile_->GetPrefs()->SetBoolean(prefs::kSyncFaviconsEnabled, true);
-
current_experiments_ = experiments;
}
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index d1999d1..49d3230 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -111,12 +111,6 @@ void SyncPrefs::RegisterProfilePrefs(
std::string(),
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
- // Keeps track whether server experiments have been switched on for that user.
- registry->RegisterBooleanPref(
- prefs::kSyncFaviconsEnabled,
- false,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-
// We will start prompting people about new data types after the launch of
// SESSIONS - all previously launched data types are treated as if they are
// already acknowledged.
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index 9e902c7..45a2cea 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -59,6 +59,8 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
// AUTOFILL_PROFILE is lumped together with AUTOFILL.
// SESSIONS is lumped together with PROXY_TABS and
// HISTORY_DELETE_DIRECTIVES.
+ // Favicons are lumped together with PROXY_TABS and
+ // HISTORY_DELETE_DIRECTIVES.
if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS) {
continue;
}
@@ -118,10 +120,14 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
// SESSIONS is lumped together with PROXY_TABS and TYPED_URLS.
// HISTORY_DELETE_DIRECTIVES is lumped together with TYPED_URLS.
// PRIORITY_PREFERENCES is lumped together with PREFERENCES.
+ // Favicons are lumped together with PROXY_TABS and
+ // HISTORY_DELETE_DIRECTIVES.
if (it.Get() == syncer::AUTOFILL_PROFILE ||
it.Get() == syncer::SESSIONS ||
it.Get() == syncer::HISTORY_DELETE_DIRECTIVES ||
- it.Get() == syncer::PRIORITY_PREFERENCES) {
+ it.Get() == syncer::PRIORITY_PREFERENCES ||
+ it.Get() == syncer::FAVICON_IMAGES ||
+ it.Get() == syncer::FAVICON_TRACKING) {
continue;
}
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index ff33533..63c6eb6 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -418,6 +418,9 @@ const char kDisableSyncExtensionSettings[] = "disable-sync-extension-settings";
// Disables syncing of extensions.
const char kDisableSyncExtensions[] = "disable-sync-extensions";
+// Disables syncing of favicons.
+const char kDisableSyncFavicons[] = "disable-sync-favicons";
+
// Disables syncing browser passwords.
const char kDisableSyncPasswords[] = "disable-sync-passwords";
@@ -684,9 +687,6 @@ const char kEnableStackedTabStrip[] = "enable-stacked-tab-strip";
// Enables experimental suggestions pane in New Tab page.
const char kEnableSuggestionsTabPage[] = "enable-suggestions-ntp";
-// Enables synced favicons
-const char kEnableSyncFavicons[] = "enable-sync-favicons";
-
// Enables synced notifications.
const char kEnableSyncSyncedNotifications[] =
"enable-sync-synced-notifications";
@@ -1342,9 +1342,6 @@ const char kSyncAllowInsecureXmppConnection[] =
// Invalidates any login info passed into sync's XMPP connection.
const char kSyncInvalidateXmppLogin[] = "sync-invalidate-xmpp-login";
-// Enable support for keystore key based encryption.
-const char kSyncKeystoreEncryption[] = "sync-keystore-encryption";
-
// This flag causes sync to retry very quickly (see polling_constants.h) the
// when it encounters an error, as the first step towards exponential backoff.
const char kSyncShortInitialRetryOverride[] =
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1ca7e29..2678d52 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -124,6 +124,7 @@ extern const char kDisableSyncBookmarks[];
extern const char kDisableSyncDictionary[];
extern const char kDisableSyncExtensionSettings[];
extern const char kDisableSyncExtensions[];
+extern const char kDisableSyncFavicons[];
extern const char kDisableSyncPasswords[];
extern const char kDisableSyncPreferences[];
extern const char kDisableSyncPriorityPreferences[];
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 2a3b4b8..f7d6a7b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1857,9 +1857,6 @@ const char kSyncKeystoreEncryptionBootstrapToken[] =
// passphrase.
const char kSyncUsingSecondaryPassphrase[] = "sync.using_secondary_passphrase";
-// Preferences that follow the status of sync server triggered experiments.
-const char kSyncFaviconsEnabled[] ="sync.favicons_syncing_enabled";
-
// String the identifies the last user that logged into sync and other
// google services. As opposed to kGoogleServicesUsername, this value is not
// cleared on signout, but while the user is signed in the two values will
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 26a4ed1..a7588f7 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -674,8 +674,6 @@ extern const char kSyncPromoShowOnFirstRunAllowed[];
extern const char kSyncPromoShowNTPBubble[];
extern const char kSyncPromoErrorMessage[];
-extern const char kSyncFaviconsEnabled[];
-
extern const char kProfileGAIAInfoUpdateTime[];
extern const char kProfileGAIAInfoPictureURL[];
diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index 673588d..6c53e30 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -9,34 +9,22 @@
namespace syncer {
-const char kKeystoreEncryptionTag[] = "keystore_encryption";
const char kAutofillCullingTag[] = "autofill_culling";
const char kFaviconSyncTag[] = "favicon_sync";
-const char kFaviconSyncFlag[] = "enable-sync-favicons";
// A structure to hold the enable status of experimental sync features.
struct Experiments {
- Experiments() : keystore_encryption(false),
- autofill_culling(false),
- favicon_sync(false),
+ Experiments() : autofill_culling(false),
favicon_sync_limit(200) {}
bool Matches(const Experiments& rhs) {
- return (keystore_encryption == rhs.keystore_encryption &&
- autofill_culling == rhs.autofill_culling &&
- favicon_sync == rhs.favicon_sync &&
+ return (autofill_culling == rhs.autofill_culling &&
favicon_sync_limit == rhs.favicon_sync_limit);
}
- // Enable keystore encryption logic and the new encryption UI.
- bool keystore_encryption;
-
// Enable deletion of expired autofill entries (if autofill sync is enabled).
bool autofill_culling;
- // Enable the favicons sync datatypes (favicon images and favicon tracking).
- bool favicon_sync;
-
// The number of favicons that a client is permitted to sync.
int favicon_sync_limit;
};
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 5700fb9..0825317 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -1275,15 +1275,6 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
}
bool found_experiment = false;
- ReadNode keystore_node(&trans);
- if (keystore_node.InitByClientTagLookup(
- syncer::EXPERIMENTS,
- syncer::kKeystoreEncryptionTag) == BaseNode::INIT_OK &&
- keystore_node.GetExperimentsSpecifics().keystore_encryption().enabled()) {
- experiments->keystore_encryption = true;
- found_experiment = true;
- }
-
ReadNode autofill_culling_node(&trans);
if (autofill_culling_node.InitByClientTagLookup(
syncer::EXPERIMENTS,
@@ -1298,8 +1289,6 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
if (favicon_sync_node.InitByClientTagLookup(
syncer::EXPERIMENTS,
syncer::kFaviconSyncTag) == BaseNode::INIT_OK) {
- experiments->favicon_sync = favicon_sync_node.GetExperimentsSpecifics().
- favicon_sync().enabled();
experiments->favicon_sync_limit =
favicon_sync_node.GetExperimentsSpecifics().favicon_sync().
favicon_sync_limit();
generated by cgit v1.1 at 2025-02-14 20:53:08 +0000