[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

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/sync/engine/syncer_proto_util_unittest.cc b/chrome/browser/sync/engine/syncer_proto_util_unittest.cc
index c05b192..1fd0f67 100644
--- a/chrome/browser/sync/engine/syncer_proto_util_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_proto_util_unittest.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/blob.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
+#include "chrome/browser/sync/syncable/model_type_test_util.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/test/engine/mock_connection_manager.h"
 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h"
@@ -26,7 +27,6 @@
 
 using syncable::Blob;
 using syncable::ScopedDirLookup;
-using syncable::ModelTypeSet;
 using ::testing::_;
 
 namespace browser_sync {
@@ -36,7 +36,7 @@ class MockSyncSessionContext : public SyncSessionContext {
  public:
   MockSyncSessionContext() {}
   ~MockSyncSessionContext() {}
-  MOCK_METHOD2(SetUnthrottleTime, void(const ModelTypeSet&,
+  MOCK_METHOD2(SetUnthrottleTime, void(syncable::ModelEnumSet,
                                        const base::TimeTicks&));
 };
 
@@ -275,14 +275,14 @@ TEST_F(SyncerProtoUtilTest, HandleThrottlingWithDatatypes) {
   MockSyncSessionContext context;
   SyncProtocolError error;
   error.error_type = browser_sync::THROTTLED;
-  syncable::ModelTypeSet types;
-  types.insert(syncable::BOOKMARKS);
-  types.insert(syncable::PASSWORDS);
+  syncable::ModelEnumSet types;
+  types.Put(syncable::BOOKMARKS);
+  types.Put(syncable::PASSWORDS);
   error.error_data_types = types;
 
   base::TimeTicks ticks = base::TimeTicks::Now();
 
-  EXPECT_CALL(context, SetUnthrottleTime(types, ticks));
+  EXPECT_CALL(context, SetUnthrottleTime(HasModelTypes(types), ticks));
 
   SyncerProtoUtil::HandleThrottleError(error, ticks, &context, NULL);
 }