sync: move invalidation version prefs out of SyncPrefs into InvalidatorStorage.

chrome/browser/sync/sync_prefs_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_prefs.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "sync/syncable/model_type.h"
@@ skipping 107 matching lines @@
     }
     if (it.Get() == syncable::EXTENSIONS) {
       expected_preferred_types.Put(syncable::EXTENSION_SETTINGS);
     }
     sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
     EXPECT_TRUE(expected_preferred_types.Equals(
         sync_prefs.GetPreferredDataTypes(non_passive_types)));
   }
 }
 
-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));
 };
 
 TEST_F(SyncPrefsTest, ObservedPrefs) {
   SyncPrefs sync_prefs(&pref_service_);
 
   StrictMock<MockSyncPrefObserver> mock_sync_pref_observer;
   InSequence dummy;
@@ skipping 27 matching lines @@
         sync_prefs.GetAcknowledgeSyncedTypesForTest()));
   }
 }
 
 TEST_F(SyncPrefsTest, ClearPreferences) {
   SyncPrefs sync_prefs(&pref_service_);
 
   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());
   sync_prefs.SetEncryptionBootstrapToken("token");
 
   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) {
   SyncPrefs sync_prefs(NULL);
 
   EXPECT_FALSE(sync_prefs.HasSyncSetupCompleted());
   EXPECT_FALSE(sync_prefs.IsStartSuppressed());
   EXPECT_EQ(base::Time(), sync_prefs.GetLastSyncedTime());
   EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced());
   const syncable::ModelTypeSet non_passive_types = GetNonPassiveTypes();
   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
 
 }  // namespace browser_sync