summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sync_prefs_unittest.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 02:34:48 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 02:34:48 +0000
commit7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4 (patch)
treee56bacac84e7ab2ce10ff5b5adcff85859fdbb38 /chrome/browser/sync/sync_prefs_unittest.cc
parent2404a282786943958a5fce4cd111dfa538ae0a33 (diff)
downloadchromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.zip
chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.tar.gz
chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.tar.bz2
sync: move invalidation version prefs out of SyncPrefs into InvalidatorStorage.
De-coupling so we don't add more sync < > invalidations deps while adding support for storing opaque notification state in InvalidationStateTracker. Added get/setters to InvalidationStateTracker and impl (InvalidatorStorage), but it's not wired up for use yet. Next step is to add migration code to move state from syncable::Directory to InvalidationStateTracker. Comment in invalidator_storage.h explains motivations for not moving out of sync. This patch creates the c/b/s/invalidations directory, which we can move non-profile-sync-specific chrome invalidations code to (such as BridgedSyncNotifier, and the android related part of ChromeSyncNotificationsBridge). BUG=124140 TEST=InvalidatorStorageTest, should be no functional changes Review URL: https://chromiumcodereview.appspot.com/10451058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_prefs_unittest.cc')
-rw-r--r--chrome/browser/sync/sync_prefs_unittest.cc32
1 files changed, 0 insertions, 32 deletions
diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc
index a52432e..351d681 100644
--- a/chrome/browser/sync/sync_prefs_unittest.cc
+++ b/chrome/browser/sync/sync_prefs_unittest.cc
@@ -125,29 +125,6 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
}
}
-TEST_F(SyncPrefsTest, MaxInvalidationVersions) {
- SyncPrefs sync_prefs(&pref_service_);
-
- sync_notifier::InvalidationVersionMap expected_max_versions;
- EXPECT_EQ(expected_max_versions, sync_prefs.GetAllMaxVersions());
-
- expected_max_versions[syncable::BOOKMARKS] = 2;
- sync_prefs.SetMaxVersion(syncable::BOOKMARKS, 2);
- EXPECT_EQ(expected_max_versions, sync_prefs.GetAllMaxVersions());
-
- expected_max_versions[syncable::PREFERENCES] = 5;
- sync_prefs.SetMaxVersion(syncable::PREFERENCES, 5);
- EXPECT_EQ(expected_max_versions, sync_prefs.GetAllMaxVersions());
-
- expected_max_versions[syncable::APP_NOTIFICATIONS] = 3;
- sync_prefs.SetMaxVersion(syncable::APP_NOTIFICATIONS, 3);
- EXPECT_EQ(expected_max_versions, sync_prefs.GetAllMaxVersions());
-
- expected_max_versions[syncable::APP_NOTIFICATIONS] = 4;
- sync_prefs.SetMaxVersion(syncable::APP_NOTIFICATIONS, 4);
- EXPECT_EQ(expected_max_versions, sync_prefs.GetAllMaxVersions());
-}
-
class MockSyncPrefObserver : public SyncPrefObserver {
public:
MOCK_METHOD1(OnSyncManagedPrefChange, void(bool));
@@ -195,7 +172,6 @@ TEST_F(SyncPrefsTest, ClearPreferences) {
EXPECT_FALSE(sync_prefs.HasSyncSetupCompleted());
EXPECT_EQ(base::Time(), sync_prefs.GetLastSyncedTime());
EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
- EXPECT_TRUE(sync_prefs.GetAllMaxVersions().empty());
sync_prefs.SetSyncSetupCompleted();
sync_prefs.SetLastSyncedTime(base::Time::Now());
@@ -204,19 +180,12 @@ TEST_F(SyncPrefsTest, ClearPreferences) {
EXPECT_TRUE(sync_prefs.HasSyncSetupCompleted());
EXPECT_NE(base::Time(), sync_prefs.GetLastSyncedTime());
EXPECT_EQ("token", sync_prefs.GetEncryptionBootstrapToken());
- {
- sync_notifier::InvalidationVersionMap expected_max_versions;
- expected_max_versions[syncable::APP_NOTIFICATIONS] = 3;
- sync_prefs.SetMaxVersion(syncable::APP_NOTIFICATIONS, 3);
- EXPECT_EQ(expected_max_versions, sync_prefs.GetAllMaxVersions());
- }
sync_prefs.ClearPreferences();
EXPECT_FALSE(sync_prefs.HasSyncSetupCompleted());
EXPECT_EQ(base::Time(), sync_prefs.GetLastSyncedTime());
EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
- EXPECT_TRUE(sync_prefs.GetAllMaxVersions().empty());
}
TEST_F(SyncPrefsTest, NullPrefService) {
@@ -230,7 +199,6 @@ TEST_F(SyncPrefsTest, NullPrefService) {
EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(non_passive_types).Empty());
EXPECT_FALSE(sync_prefs.IsManaged());
EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
- EXPECT_TRUE(sync_prefs.GetAllMaxVersions().empty());
}
} // namespace