sync: Implementation of Priority Preferences.

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_syncable.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 50 matching lines @@
 }
 
 TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
   SyncPrefs sync_prefs(&pref_service_);
 
   EXPECT_TRUE(sync_prefs.HasKeepEverythingSynced());
 
   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;
     preferred_types.Put(it.Get());
     sync_prefs.SetPreferredDataTypes(user_types, preferred_types);
     EXPECT_TRUE(user_types.Equals(
         sync_prefs.GetPreferredDataTypes(user_types)));
   }
 }
 
 TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
   SyncPrefs sync_prefs(&pref_service_);
 
   sync_prefs.SetKeepEverythingSynced(false);
 
   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;
     preferred_types.Put(it.Get());
     syncer::ModelTypeSet expected_preferred_types(preferred_types);
     if (it.Get() == syncer::AUTOFILL) {
       expected_preferred_types.Put(syncer::AUTOFILL_PROFILE);
     }
     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) {
       expected_preferred_types.Put(syncer::APP_NOTIFICATIONS);
       expected_preferred_types.Put(syncer::APP_SETTINGS);
     }
     if (it.Get() == syncer::EXTENSIONS) {
       expected_preferred_types.Put(syncer::EXTENSION_SETTINGS);
     }
     if (it.Get() == syncer::SESSIONS) {
       expected_preferred_types.Put(syncer::HISTORY_DELETE_DIRECTIVES);
       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)));
   }
 }
 
 class MockSyncPrefObserver : public SyncPrefObserver {
  public:
   MOCK_METHOD1(OnSyncManagedPrefChange, void(bool));
 };
@@ skipping 64 matching lines @@
   EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced());
   const syncer::ModelTypeSet user_types = syncer::UserTypes();
   EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(user_types).Empty());
   EXPECT_FALSE(sync_prefs.IsManaged());
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
 }
 
 }  // namespace
 
 }  // namespace browser_sync