[Sync] Rename ModelEnumSet to ModelTypeSet

chrome/browser/sync/notifier/chrome_invalidation_client.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.
 //
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
 #ifndef CHROME_BROWSER_SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #define CHROME_BROWSER_SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
 #pragma once
@@ skipping 65 matching lines @@
 
   void Stop();
 
   // Changes the task used to |base_task|, which must still be
   // non-NULL.  Must only be called between calls to Start() and
   // Stop().
   void ChangeBaseTask(base::WeakPtr<buzz::XmppTaskParentInterface> base_task);
 
   // Register the sync types that we're interested in getting
   // notifications for.  May be called at any time.
-  void RegisterTypes(syncable::ModelEnumSet types);
+  void RegisterTypes(syncable::ModelTypeSet types);
 
   virtual void WriteState(const std::string& state) OVERRIDE;
 
   // invalidation::InvalidationListener implementation.
   virtual void Ready(
       invalidation::InvalidationClient* client) OVERRIDE;
   virtual void Invalidate(
       invalidation::InvalidationClient* client,
       const invalidation::Invalidation& invalidation,
       const invalidation::AckHandle& ack_handle) OVERRIDE;
@@ skipping 18 matching lines @@
       const std::string& prefix,
       int prefix_length) OVERRIDE;
   virtual void InformError(
       invalidation::InvalidationClient* client,
       const invalidation::ErrorInfo& error_info) OVERRIDE;
 
  private:
   friend class ChromeInvalidationClientTest;
 
   void EmitInvalidation(
-      syncable::ModelEnumSet types, const std::string& payload);
+      syncable::ModelTypeSet types, const std::string& payload);
 
   base::NonThreadSafe non_thread_safe_;
   ChromeSystemResources chrome_system_resources_;
   base::ScopedCallbackFactory<ChromeInvalidationClient>
       scoped_callback_factory_;
   InvalidationVersionMap max_invalidation_versions_;
   browser_sync::WeakHandle<InvalidationVersionTracker>
       invalidation_version_tracker_;
   Listener* listener_;
   StateWriter* state_writer_;
   scoped_ptr<invalidation::InvalidationClient> invalidation_client_;
   scoped_ptr<CacheInvalidationPacketHandler>
       cache_invalidation_packet_handler_;
   scoped_ptr<RegistrationManager> registration_manager_;
   // Stored to pass to |registration_manager_| on start.
-  syncable::ModelEnumSet registered_types_;
+  syncable::ModelTypeSet registered_types_;
   bool ticl_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInvalidationClient);
 };
 
 }  // namespace sync_notifier
 
 #endif  // CHROME_BROWSER_SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_