FYI: Control Data + Per-Device Metadata

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/internal_api/public/base/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 
 namespace {
 
 using ::testing::InSequence;
 using ::testing::StrictMock;
 
 class SyncPrefsTest : public testing::Test {
  protected:
   TestingPrefService pref_service_;
 
  private:
   MessageLoop loop_;
 };
 
 // Get all types with a user-facing component.
-syncer::ModelTypeSet GetNonPassiveTypes() {
-  syncer::ModelTypeSet non_passive_types = syncer::ModelTypeSet::All();
-  non_passive_types.Remove(syncer::NIGORI);
-  return non_passive_types;
+syncer::ModelTypeSet GetUserControlledTypes() {
+  syncer::ModelTypeSet user_controlled_types = syncer::ModelTypeSet::All();
+  user_controlled_types.RemoveAll(syncer::ControlTypes());
+  return user_controlled_types;
 }
 
 // Returns all types visible from the setup UI.
 syncer::ModelTypeSet GetUserVisibleTypes() {
-  syncer::ModelTypeSet user_visible_types(GetNonPassiveTypes());
+  syncer::ModelTypeSet user_visible_types(GetUserControlledTypes());
   user_visible_types.Remove(syncer::APP_NOTIFICATIONS);
   user_visible_types.Remove(syncer::APP_SETTINGS);
   user_visible_types.Remove(syncer::AUTOFILL_PROFILE);
   user_visible_types.Remove(syncer::EXTENSION_SETTINGS);
   user_visible_types.Remove(syncer::SEARCH_ENGINES);
   return user_visible_types;
 }
 
 TEST_F(SyncPrefsTest, Basic) {
   SyncPrefs sync_prefs(&pref_service_);
@@ skipping 22 matching lines @@
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
   sync_prefs.SetEncryptionBootstrapToken("token");
   EXPECT_EQ("token", sync_prefs.GetEncryptionBootstrapToken());
 }
 
 TEST_F(SyncPrefsTest, PreferredTypesKeepEverythingSynced) {
   SyncPrefs sync_prefs(&pref_service_);
 
   EXPECT_TRUE(sync_prefs.HasKeepEverythingSynced());
 
-  const syncer::ModelTypeSet non_passive_types = GetNonPassiveTypes();
-  EXPECT_TRUE(non_passive_types.Equals(
-      sync_prefs.GetPreferredDataTypes(non_passive_types)));
+  const syncer::ModelTypeSet user_controlled_types = GetUserControlledTypes();
+  EXPECT_TRUE(user_controlled_types.Equals(
+      sync_prefs.GetPreferredDataTypes(user_controlled_types)));
   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());
-    sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
-    EXPECT_TRUE(non_passive_types.Equals(
-        sync_prefs.GetPreferredDataTypes(non_passive_types)));
+    sync_prefs.SetPreferredDataTypes(user_controlled_types, preferred_types);
+    EXPECT_TRUE(user_controlled_types.Equals(
+        sync_prefs.GetPreferredDataTypes(user_controlled_types)));
   }
 }
 
 TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
   SyncPrefs sync_prefs(&pref_service_);
 
   sync_prefs.SetKeepEverythingSynced(false);
 
-  const syncer::ModelTypeSet non_passive_types = GetNonPassiveTypes();
-  EXPECT_TRUE(non_passive_types.Equals(
-      sync_prefs.GetPreferredDataTypes(non_passive_types)));
+  const syncer::ModelTypeSet user_controlled_types = GetUserControlledTypes();
+  EXPECT_TRUE(user_controlled_types.Equals(
+      sync_prefs.GetPreferredDataTypes(user_controlled_types)));
   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::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);
     }
-    sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
+    sync_prefs.SetPreferredDataTypes(user_controlled_types, preferred_types);
     EXPECT_TRUE(expected_preferred_types.Equals(
-        sync_prefs.GetPreferredDataTypes(non_passive_types)));
+        sync_prefs.GetPreferredDataTypes(user_controlled_types)));
   }
 }
 
 class MockSyncPrefObserver : public SyncPrefObserver {
  public:
   MOCK_METHOD1(OnSyncManagedPrefChange, void(bool));
 };
 
 TEST_F(SyncPrefsTest, ObservedPrefs) {
   SyncPrefs sync_prefs(&pref_service_);
@@ skipping 52 matching lines @@
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().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 syncer::ModelTypeSet non_passive_types = GetNonPassiveTypes();
-  EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(non_passive_types).Empty());
+  const syncer::ModelTypeSet user_controlled_types = GetUserControlledTypes();
+  EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(user_controlled_types).Empty());
   EXPECT_FALSE(sync_prefs.IsManaged());
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
 }
 
 }  // namespace
 
 }  // namespace browser_sync