Add a declarative way in c/b/s/sync_prefs.cc to say which data types have prefs

chrome/browser/sync/sync_prefs_unittest.cc

 // Copyright (c) 2011 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/browser/sync/syncable/model_type.h"
 #include "chrome/test/base/testing_pref_service.h"
@@ skipping 18 matching lines @@
 // Get all types with a user-facing component.
 syncable::ModelTypeSet GetNonPassiveTypes() {
   syncable::ModelTypeSet non_passive_types = syncable::ModelTypeSet::All();
   non_passive_types.Remove(syncable::NIGORI);
   return non_passive_types;
 }
 
 // Returns all types visible from the setup UI.
 syncable::ModelTypeSet GetUserVisibleTypes() {
   syncable::ModelTypeSet user_visible_types(GetNonPassiveTypes());
+  user_visible_types.Remove(syncable::APP_NOTIFICATIONS);
+  user_visible_types.Remove(syncable::APP_SETTINGS);
   user_visible_types.Remove(syncable::AUTOFILL_PROFILE);
+  user_visible_types.Remove(syncable::EXTENSION_SETTINGS);
   user_visible_types.Remove(syncable::SEARCH_ENGINES);
-  user_visible_types.Remove(syncable::APP_NOTIFICATIONS);
   return user_visible_types;
 }
 
 TEST_F(SyncPrefsTest, Basic) {
   SyncPrefs sync_prefs(&pref_service_);
 
   EXPECT_FALSE(sync_prefs.HasSyncSetupCompleted());
   sync_prefs.SetSyncSetupCompleted();
   EXPECT_TRUE(sync_prefs.HasSyncSetupCompleted());
 
@@ skipping 53 matching lines @@
     preferred_types.Put(it.Get());
     syncable::ModelTypeSet expected_preferred_types(preferred_types);
     if (it.Get() == syncable::AUTOFILL) {
       expected_preferred_types.Put(syncable::AUTOFILL_PROFILE);
     }
     if (it.Get() == syncable::PREFERENCES) {
       expected_preferred_types.Put(syncable::SEARCH_ENGINES);
     }
     if (it.Get() == syncable::APPS) {
       expected_preferred_types.Put(syncable::APP_NOTIFICATIONS);
+      expected_preferred_types.Put(syncable::APP_SETTINGS);
+    }
+    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_);
 
@@ skipping 98 matching lines @@
   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