[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/sessions/session_state_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/sessions/session_state.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 108 matching lines @@
       syncer_status.ToValue());
 
   ErrorCounters errors;
   errors.num_conflicting_commits = 250;
   scoped_ptr<DictionaryValue> expected_errors_value(
       errors.ToValue());
 
   const int kNumServerChangesRemaining = 105;
   const bool kIsShareUsable = true;
 
-  const syncable::ModelEnumSet initial_sync_ended(
+  const syncable::ModelTypeSet initial_sync_ended(
       syncable::BOOKMARKS, syncable::PREFERENCES);
   scoped_ptr<ListValue> expected_initial_sync_ended_value(
-      syncable::ModelEnumSetToValue(initial_sync_ended));
+      syncable::ModelTypeSetToValue(initial_sync_ended));
 
   std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
   download_progress_markers[syncable::BOOKMARKS] = "test";
   download_progress_markers[syncable::APPS] = "apps";
   scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
       DownloadProgressMarkersToValue(download_progress_markers));
 
   const bool kHasMoreToSync = false;
   const bool kIsSilenced = true;
   const int kUnsyncedCount = 1053;
@@ skipping 39 matching lines @@
   ExpectDictIntegerValue(kNumConflictingUpdates, *value,
                          "numConflictingUpdates");
   ExpectDictBooleanValue(kDidCommitItems, *value,
                          "didCommitItems");
   ExpectDictDictionaryValue(*expected_source_value, *value, "source");
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync