sync: Implementation of Priority Preferences.

chrome/browser/sync/sync_prefs_unittest.cc

Index: chrome/browser/sync/sync_prefs_unittest.cc
diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc
index ea114f2b4bdfa1a199ae317dbd8db9624d94de2c..43a64772e2a35c499b01bf9d3d27676777a03cb9 100644
--- a/chrome/browser/sync/sync_prefs_unittest.cc
+++ b/chrome/browser/sync/sync_prefs_unittest.cc
@@ -68,7 +68,7 @@ TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
   const syncer::ModelTypeSet user_types = syncer::UserTypes();
   EXPECT_TRUE(user_types.Equals(
       sync_prefs.GetPreferredDataTypes(user_types)));
-  const syncer::ModelTypeSet user_visible_types = syncer::UserSelectableTypes();
+  const syncer::ModelTypeSet user_visible_types = GetUserVisibleTypes();

[Nicolas Zea, 2013/02/21 23:41:11]

Why did this change?

[albertb, 2013/02/22 20:08:47]

Oops, probably a bad conflict resolve.

   for (syncer::ModelTypeSet::Iterator it = user_visible_types.First();
        it.Good(); it.Inc()) {
     syncer::ModelTypeSet preferred_types;
@@ -87,7 +87,7 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
   const syncer::ModelTypeSet user_types = syncer::UserTypes();
   EXPECT_TRUE(user_types.Equals(
       sync_prefs.GetPreferredDataTypes(user_types)));
-  const syncer::ModelTypeSet user_visible_types = syncer::UserSelectableTypes();
+  const syncer::ModelTypeSet user_visible_types = GetUserVisibleTypes();
   for (syncer::ModelTypeSet::Iterator it = user_visible_types.First();
        it.Good(); it.Inc()) {
     syncer::ModelTypeSet preferred_types;
@@ -98,6 +98,7 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
     }
     if (it.Get() == syncer::PREFERENCES) {
       expected_preferred_types.Put(syncer::DICTIONARY);
+      expected_preferred_types.Put(syncer::PRIORITY_PREFERENCES);
       expected_preferred_types.Put(syncer::SEARCH_ENGINES);
     }
     if (it.Get() == syncer::APPS) {
@@ -112,6 +113,11 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
       expected_preferred_types.Put(syncer::FAVICON_IMAGES);
       expected_preferred_types.Put(syncer::FAVICON_TRACKING);
     }
+    // TODO(akalin): Remove this when history delete directives are
+    // registered by default.
+    if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES) {
+      expected_preferred_types.Clear();
+    }
     sync_prefs.SetPreferredDataTypes(user_types, preferred_types);
     EXPECT_TRUE(expected_preferred_types.Equals(
         sync_prefs.GetPreferredDataTypes(user_types)));