[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/test/engine/mock_connection_manager.h

 // 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.
 //
 // Mock ServerConnectionManager class for use in client unit tests.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define CHROME_BROWSER_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #pragma once
 
@@ skipping 189 matching lines @@
   // the syncer.
   int GetAndClearNumGetUpdatesRequests() {
     int result = num_get_updates_requests_;
     num_get_updates_requests_ = 0;
     return result;
   }
 
   // Expect that GetUpdates will request exactly the types indicated in
   // the bitset.
   void ExpectGetUpdatesRequestTypes(
-      std::bitset<syncable::MODEL_TYPE_COUNT> expected_filter) {
+      syncable::ModelEnumSet expected_filter) {
     expected_filter_ = expected_filter;
   }
 
   void ExpectGetUpdatesRequestPayloads(
       const syncable::ModelTypePayloadMap& payloads) {
     expected_payloads_ = payloads;
   }
 
   void SetServerReachable();
 
@@ skipping 116 matching lines @@
   scoped_ptr<sync_pb::ClientCommand> client_command_;
 
   // The next value to use for the position_in_parent property.
   int64 next_position_in_parent_;
 
   // The default is to use the newer sync_pb::BookmarkSpecifics-style protocol.
   // If this option is set to true, then the MockConnectionManager will
   // use the older sync_pb::SyncEntity_BookmarkData-style protocol.
   bool use_legacy_bookmarks_protocol_;
 
-  std::bitset<syncable::MODEL_TYPE_COUNT> expected_filter_;
+  syncable::ModelEnumSet expected_filter_;
 
   syncable::ModelTypePayloadMap expected_payloads_;
 
   int num_get_updates_requests_;
 
   std::string next_token_;
 
   sync_pb::ClientToServerMessage last_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_