[Sync] Replace all instances of ModelTypeSet with ModelEnumSet

chrome/browser/sync/engine/syncer_proto_util_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/engine/syncer_proto_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #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"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncable::Blob;
 using syncable::ScopedDirLookup;
-using syncable::ModelTypeSet;
 using ::testing::_;
 
 namespace browser_sync {
 using sessions::SyncSessionContext;
 
 class MockSyncSessionContext : public SyncSessionContext {
  public:
   MockSyncSessionContext() {}
   ~MockSyncSessionContext() {}
-  MOCK_METHOD2(SetUnthrottleTime, void(const ModelTypeSet&,
+  MOCK_METHOD2(SetUnthrottleTime, void(syncable::ModelEnumSet,
                                        const base::TimeTicks&));
 };
 
 class MockDelegate : public sessions::SyncSession::Delegate {
  public:
    MockDelegate() {}
    ~MockDelegate() {}
 
   MOCK_METHOD0(IsSyncingCurrentlySilenced, bool());
   MOCK_METHOD1(OnReceivedShortPollIntervalUpdate, void(const base::TimeDelta&));
@@ skipping 218 matching lines @@
 
   dcm.set_access_denied(true);
   EXPECT_FALSE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
       msg, &response));
 }
 
 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);
 }
 
 TEST_F(SyncerProtoUtilTest, HandleThrottlingNoDatatypes) {
   MockDelegate delegate;
   SyncProtocolError error;
   error.error_type = browser_sync::THROTTLED;
 
   base::TimeTicks ticks = base::TimeTicks::Now();
 
   EXPECT_CALL(delegate, OnSilencedUntil(ticks));
 
   SyncerProtoUtil::HandleThrottleError(error, ticks, NULL, &delegate);
 }
 }  // namespace browser_sync