Index: chrome/common/pref_names.cc |
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc |
index b231a17b1b27d48b666c7d9099e652406711c53e..b1bdbe907ec81ccb76c9d736391aa0bd0c2f46fd 100644 |
--- a/chrome/common/pref_names.cc |
+++ b/chrome/common/pref_names.cc |
@@ -101,12 +101,6 @@ const char kRestoreStartupURLsMigrationTime[] = |
// data in the profile folder on disk but only in memory. |
const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; |
-// Set to true when enhanced bookmarks experiment is enabled via Chrome sync. |
-const char kEnhancedBookmarksExperimentEnabled[] = "enhanced_bookmarks_enabled"; |
- |
-// Enhanced bookmarks extension id passed via Chrome sync. |
-const char kEnhancedBookmarksExtensionId[] = "enhanced_bookmarks_extension_id"; |
- |
// The application locale. |
// For OS_CHROMEOS we maintain kApplicationLocale property in both local state |
// and user's profile. Global property determines locale of login screen, |
@@ -1813,68 +1807,6 @@ const char kSpdyProxyAuthWasEnabledBefore[] = "spdy_proxy.was_enabled_before"; |
// Boolean which stores if the user is allowed to signin to chrome. |
const char kSigninAllowed[] = "signin.allowed"; |
-// 64-bit integer serialization of the base::Time when the last sync occurred. |
-const char kSyncLastSyncedTime[] = "sync.last_synced_time"; |
- |
-// Boolean specifying whether the user finished setting up sync. |
-const char kSyncHasSetupCompleted[] = "sync.has_setup_completed"; |
- |
-// Boolean specifying whether sync has an auth error. |
-const char kSyncHasAuthError[] = "sync.has_auth_error"; |
- |
-// Boolean specifying whether to automatically sync all data types (including |
-// future ones, as they're added). If this is true, the following preferences |
-// (kSyncBookmarks, kSyncPasswords, etc.) can all be ignored. |
-const char kSyncKeepEverythingSynced[] = "sync.keep_everything_synced"; |
- |
-// Booleans specifying whether the user has selected to sync the following |
-// datatypes. |
-const char kSyncAppList[] = "sync.app_list"; |
-const char kSyncAppNotifications[] = "sync.app_notifications"; |
-const char kSyncAppSettings[] = "sync.app_settings"; |
-const char kSyncApps[] = "sync.apps"; |
-const char kSyncAutofillProfile[] = "sync.autofill_profile"; |
-const char kSyncAutofill[] = "sync.autofill"; |
-const char kSyncBookmarks[] = "sync.bookmarks"; |
-const char kSyncDictionary[] = "sync.dictionary"; |
-const char kSyncExtensionSettings[] = "sync.extension_settings"; |
-const char kSyncExtensions[] = "sync.extensions"; |
-const char kSyncFaviconImages[] = "sync.favicon_images"; |
-const char kSyncFaviconTracking[] = "sync.favicon_tracking"; |
-const char kSyncHistoryDeleteDirectives[] = "sync.history_delete_directives"; |
-const char kSyncManagedUserSettings[] = "sync.managed_user_settings"; |
-const char kSyncManagedUserSharedSettings[] = |
- "sync.managed_user_shared_settings"; |
-const char kSyncManagedUsers[] = "sync.managed_users"; |
-const char kSyncArticles[] = "sync.articles"; |
-const char kSyncPasswords[] = "sync.passwords"; |
-const char kSyncPreferences[] = "sync.preferences"; |
-const char kSyncPriorityPreferences[] = "sync.priority_preferences"; |
-const char kSyncSearchEngines[] = "sync.search_engines"; |
-const char kSyncSessions[] = "sync.sessions"; |
-const char kSyncSyncedNotificationAppInfo[] = |
- "sync.synced_notification_app_info"; |
-const char kSyncSyncedNotifications[] = "sync.synced_notifications"; |
-const char kSyncTabs[] = "sync.tabs"; |
-const char kSyncThemes[] = "sync.themes"; |
-const char kSyncTypedUrls[] = "sync.typed_urls"; |
- |
-// Boolean used by enterprise configuration management in order to lock down |
-// sync. |
-const char kSyncManaged[] = "sync.managed"; |
- |
-// Boolean to prevent sync from automatically starting up. This is |
-// used when sync is disabled by the user via the privacy dashboard. |
-const char kSyncSuppressStart[] = "sync.suppress_start"; |
- |
-// List of the currently acknowledged set of sync types, used to figure out |
-// if a new sync type has rolled out so we can notify the user. |
-const char kSyncAcknowledgedSyncTypes[] = "sync.acknowledged_types"; |
- |
-// The GUID session sync will use to identify this client, even across sync |
-// disable/enable events. |
-const char kSyncSessionsGUID[] = "sync.session_sync_guid"; |
- |
// An ID to uniquely identify this client to the invalidator service. |
const char kInvalidatorClientId[] = "invalidator.client_id"; |
@@ -1886,20 +1818,6 @@ const char kInvalidatorInvalidationState[] = "invalidator.invalidation_state"; |
// yet. Used to keep invalidation clients in sync in case of a restart. |
const char kInvalidatorSavedInvalidations[] = "invalidator.saved_invalidations"; |
-// A string that can be used to restore sync encryption infrastructure on |
-// startup so that the user doesn't need to provide credentials on each start. |
-const char kSyncEncryptionBootstrapToken[] = |
- "sync.encryption_bootstrap_token"; |
- |
-// Same as kSyncEncryptionBootstrapToken, but derived from the keystore key, |
-// so we don't have to do a GetKey command at restart. |
-const char kSyncKeystoreEncryptionBootstrapToken[] = |
- "sync.keystore_encryption_bootstrap_token"; |
- |
-// Boolean tracking whether the user chose to specify a secondary encryption |
-// passphrase. |
-const char kSyncUsingSecondaryPassphrase[] = "sync.using_secondary_passphrase"; |
- |
// 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 |
@@ -2186,10 +2104,6 @@ const char kDeviceActivityTimes[] = "device_status.activity_times"; |
// enabled. |
const char kDeviceLocation[] = "device_status.location"; |
-// A string that is used to store first-time sync startup after once sync is |
-// disabled. This will be refreshed every sign-in. |
-const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token"; |
- |
// A pref holding the value of the policy used to disable mounting of external |
// storage for the user. |
const char kExternalStorageDisabled[] = "hardware.external_storage_disabled"; |