[Sync] Move ModelType and related classes to 'syncer' namespace

sync/notifier/invalidation_notifier.cc

 // Copyright (c) 2012 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 "sync/notifier/invalidation_notifier.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "jingle/notifier/listener/push_client.h"
@@ skipping 69 matching lines @@
         initial_max_invalidation_versions_,
         invalidation_state_tracker_,
         this);
     invalidation_state_.clear();
     state_ = STARTED;
   }
   invalidation_client_.UpdateCredentials(email, token);
 }
 
 void InvalidationNotifier::UpdateEnabledTypes(
-    syncable::ModelTypeSet enabled_types) {
+    syncer::ModelTypeSet enabled_types) {
   DCHECK(CalledOnValidThread());
   CHECK(!invalidation_client_id_.empty());
   ObjectIdSet ids;
-  for (syncable::ModelTypeSet::Iterator it = enabled_types.First(); it.Good();
+  for (syncer::ModelTypeSet::Iterator it = enabled_types.First(); it.Good();
        it.Inc()) {
     invalidation::ObjectId id;
     if (!RealModelTypeToObjectId(it.Get(), &id)) {
       DLOG(WARNING) << "Invalid model type " << it.Get();
       continue;
     }
     ids.insert(id);
   }
   invalidation_client_.RegisterIds(ids);
 }
 
 void InvalidationNotifier::SendNotification(
-    syncable::ModelTypeSet changed_types) {
+    syncer::ModelTypeSet changed_types) {
   DCHECK(CalledOnValidThread());
   // Do nothing.
 }
 
 void InvalidationNotifier::OnInvalidate(const ObjectIdPayloadMap& id_payloads) {
   DCHECK(CalledOnValidThread());
   // TODO(dcheng): This should probably be a utility function somewhere...
-  syncable::ModelTypePayloadMap type_payloads;
+  syncer::ModelTypePayloadMap type_payloads;
   for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
        it != id_payloads.end(); ++it) {
-    syncable::ModelType model_type;
+    syncer::ModelType model_type;
     if (!ObjectIdToRealModelType(it->first, &model_type)) {
       DLOG(WARNING) << "Invalid object ID: " << ObjectIdToString(it->first);
       continue;
     }
     type_payloads[model_type] = it->second;
   }
   FOR_EACH_OBSERVER(
       SyncNotifierObserver, observers_,
       OnIncomingNotification(type_payloads,
                              syncer::REMOTE_NOTIFICATION));
 }
 
 void InvalidationNotifier::OnNotificationsEnabled() {
   DCHECK(CalledOnValidThread());
   FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
                     OnNotificationsEnabled());
 }
 
 void InvalidationNotifier::OnNotificationsDisabled(
     NotificationsDisabledReason reason) {
   DCHECK(CalledOnValidThread());
   FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
                     OnNotificationsDisabled(reason));
 }
 
 }  // namespace syncer