diff options
| author | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 04:36:54 +0000 |
|---|---|---|
| committer | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 04:36:54 +0000 |
| commit | 8576d3230816c35b6e6b571a43b77d7270ff445e (patch) | |
| tree | eba7d1165302cd9691fd0de2d8a0339be42d7d41 /chrome/browser/sync/sync_prefs_unittest.cc | |
| parent | 5eddc3ed58ad893c3d1584c38dd27a48e197fb79 (diff) | |
| download | chromium_src-8576d3230816c35b6e6b571a43b77d7270ff445e.zip chromium_src-8576d3230816c35b6e6b571a43b77d7270ff445e.tar.gz chromium_src-8576d3230816c35b6e6b571a43b77d7270ff445e.tar.bz2 | |
Remove app notifications checkbox and piggy back on Apps checkbox in sync UI.
Review URL: http://codereview.chromium.org/8387021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_prefs_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/sync_prefs_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc index 5bf2e06..fedfa52 100644 --- a/chrome/browser/sync/sync_prefs_unittest.cc +++ b/chrome/browser/sync/sync_prefs_unittest.cc @@ -41,6 +41,7 @@ syncable::ModelTypeSet GetNonPassiveTypes() { syncable::ModelTypeSet GetUserVisibleTypes() { syncable::ModelTypeSet user_visible_types(GetNonPassiveTypes()); user_visible_types.erase(syncable::AUTOFILL_PROFILE); + user_visible_types.erase(syncable::APP_NOTIFICATIONS); return user_visible_types; } @@ -109,6 +110,9 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) { if (*it == syncable::AUTOFILL) { expected_preferred_types.insert(syncable::AUTOFILL_PROFILE); } + if (*it == syncable::APPS) { + expected_preferred_types.insert(syncable::APP_NOTIFICATIONS); + } sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types); EXPECT_EQ(expected_preferred_types, sync_prefs.GetPreferredDataTypes(non_passive_types)); |