summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service_password_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 01:00:54 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 01:00:54 +0000
commit71229fa8616c36c326dab127564922b14e443fa9 (patch)
tree957775bd807925f58c05ae54be374489a10b6900 /chrome/browser/sync/profile_sync_service_password_unittest.cc
parent6736d2d93e021d9889d7d534f4e8865cf81cb882 (diff)
downloadchromium_src-71229fa8616c36c326dab127564922b14e443fa9.zip
chromium_src-71229fa8616c36c326dab127564922b14e443fa9.tar.gz
chromium_src-71229fa8616c36c326dab127564922b14e443fa9.tar.bz2
[Sync] Replace all instances of ModelTypeSet with ModelEnumSet
Also change some functions to return ModelEnumSets directly instead of taking a pointer value. BUG=79970 TEST= Review URL: http://codereview.chromium.org/8851006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_password_unittest.cc')
-rw-r--r--chrome/browser/sync/profile_sync_service_password_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index cfb4084..4ee02c4 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -215,9 +215,9 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest {
service_.reset(new PasswordTestProfileSyncService(
&factory_, &profile_, "test_user", false,
root_callback, node_callback));
- syncable::ModelTypeSet preferred_types;
- service_->GetPreferredDataTypes(&preferred_types);
- preferred_types.insert(syncable::PASSWORDS);
+ syncable::ModelEnumSet preferred_types =
+ service_->GetPreferredDataTypes();
+ preferred_types.Put(syncable::PASSWORDS);
service_->ChangePreferredDataTypes(preferred_types);
EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(
Return(service_.get()));