[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/engine/download_updates_command_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/download_updates_command.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
@@ skipping 27 matching lines @@
 
   DownloadUpdatesCommand command_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadUpdatesCommandTest);
 };
 
 TEST_F(DownloadUpdatesCommandTest, ExecuteNoPayloads) {
   ConfigureMockServerConnection();
   mock_server()->ExpectGetUpdatesRequestTypes(
-      ModelTypeBitSetFromSet(GetRoutingInfoTypes(routing_info())));
+      GetRoutingInfoTypes(routing_info()));
   command_.ExecuteImpl(session());
 }
 
 TEST_F(DownloadUpdatesCommandTest, ExecuteWithPayloads) {
   ConfigureMockServerConnection();
   sessions::SyncSourceInfo source;
   source.types[syncable::AUTOFILL] = "autofill_payload";
   source.types[syncable::BOOKMARKS] = "bookmark_payload";
   source.types[syncable::PREFERENCES] = "preferences_payload";
   mock_server()->ExpectGetUpdatesRequestTypes(
-      ModelTypeBitSetFromSet(GetRoutingInfoTypes(routing_info())));
+      GetRoutingInfoTypes(routing_info()));
   mock_server()->ExpectGetUpdatesRequestPayloads(source.types);
   command_.ExecuteImpl(session(source));
 }
 
 TEST_F(DownloadUpdatesCommandTest, VerifyAppendDebugInfo) {
   sync_pb::DebugInfo debug_info;
   EXPECT_CALL(*(mock_debug_info_getter()), GetAndClearDebugInfo(_))
       .Times(1);
   command_.AppendClientDebugInfoIfNeeded(session(), &debug_info);
 
   // Now try to add it once more and make sure |GetAndClearDebugInfo| is not
   // called.
   command_.AppendClientDebugInfoIfNeeded(session(), &debug_info);
 }
 
 }  // namespace browser_sync