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

chrome/browser/sync/glue/sync_backend_registrar.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 "chrome/browser/sync/glue/sync_backend_registrar.h"
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 35 matching lines @@
       return true;
     case syncer::MODEL_SAFE_GROUP_COUNT:
     default:
       return false;
   }
 }
 
 }  // namespace
 
 SyncBackendRegistrar::SyncBackendRegistrar(
-    syncable::ModelTypeSet initial_types,
+    syncer::ModelTypeSet initial_types,
     const std::string& name, Profile* profile,
     MessageLoop* sync_loop) :
     name_(name),
     profile_(profile),
     sync_loop_(sync_loop),
     ui_worker_(new UIModelWorker()),
     stopped_on_ui_thread_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(profile_);
   DCHECK(sync_loop_);
   workers_[syncer::GROUP_DB] = new DatabaseModelWorker();
   workers_[syncer::GROUP_FILE] = new FileModelWorker();
   workers_[syncer::GROUP_UI] = ui_worker_;
   workers_[syncer::GROUP_PASSIVE] = new syncer::PassiveModelWorker(sync_loop_);
 
   // Any datatypes that we want the syncer to pull down must be in the
   // routing_info map.  We set them to group passive, meaning that
   // updates will be applied to sync, but not dispatched to the native
   // models.
-  for (syncable::ModelTypeSet::Iterator it = initial_types.First();
+  for (syncer::ModelTypeSet::Iterator it = initial_types.First();
        it.Good(); it.Inc()) {
     routing_info_[it.Get()] = syncer::GROUP_PASSIVE;
   }
 
   HistoryService* history_service = profile->GetHistoryService(
       Profile::IMPLICIT_ACCESS);
   if (history_service) {
     workers_[syncer::GROUP_HISTORY] = new HistoryModelWorker(history_service);
   } else {
-    LOG_IF(WARNING, initial_types.Has(syncable::TYPED_URLS))
+    LOG_IF(WARNING, initial_types.Has(syncer::TYPED_URLS))
         << "History store disabled, cannot sync Omnibox History";
-    routing_info_.erase(syncable::TYPED_URLS);
+    routing_info_.erase(syncer::TYPED_URLS);
   }
 
   scoped_refptr<PasswordStore> password_store =
       PasswordStoreFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);
   if (password_store.get()) {
     workers_[syncer::GROUP_PASSWORD] = new PasswordModelWorker(password_store);
   } else {
-    LOG_IF(WARNING, initial_types.Has(syncable::PASSWORDS))
+    LOG_IF(WARNING, initial_types.Has(syncer::PASSWORDS))
         << "Password store not initialized, cannot sync passwords";
-    routing_info_.erase(syncable::PASSWORDS);
+    routing_info_.erase(syncer::PASSWORDS);
   }
 }
 
 SyncBackendRegistrar::~SyncBackendRegistrar() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(stopped_on_ui_thread_);
 }
 
 bool SyncBackendRegistrar::IsNigoriEnabled() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::AutoLock lock(lock_);
-  return routing_info_.find(syncable::NIGORI) != routing_info_.end();
+  return routing_info_.find(syncer::NIGORI) != routing_info_.end();
 }
 
-syncable::ModelTypeSet SyncBackendRegistrar::ConfigureDataTypes(
-    syncable::ModelTypeSet types_to_add,
-    syncable::ModelTypeSet types_to_remove) {
+syncer::ModelTypeSet SyncBackendRegistrar::ConfigureDataTypes(
+    syncer::ModelTypeSet types_to_add,
+    syncer::ModelTypeSet types_to_remove) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(Intersection(types_to_add, types_to_remove).Empty());
-  syncable::ModelTypeSet filtered_types_to_add = types_to_add;
+  syncer::ModelTypeSet filtered_types_to_add = types_to_add;
   if (workers_.count(syncer::GROUP_HISTORY) == 0) {
     LOG(WARNING) << "No history worker -- removing TYPED_URLS";
-    filtered_types_to_add.Remove(syncable::TYPED_URLS);
+    filtered_types_to_add.Remove(syncer::TYPED_URLS);
   }
   if (workers_.count(syncer::GROUP_PASSWORD) == 0) {
     LOG(WARNING) << "No password worker -- removing PASSWORDS";
-    filtered_types_to_add.Remove(syncable::PASSWORDS);
+    filtered_types_to_add.Remove(syncer::PASSWORDS);
   }
 
   base::AutoLock lock(lock_);
-  syncable::ModelTypeSet newly_added_types;
-  for (syncable::ModelTypeSet::Iterator it =
+  syncer::ModelTypeSet newly_added_types;
+  for (syncer::ModelTypeSet::Iterator it =
            filtered_types_to_add.First();
        it.Good(); it.Inc()) {
     // Add a newly specified data type as syncer::GROUP_PASSIVE into the
     // routing_info, if it does not already exist.
     if (routing_info_.count(it.Get()) == 0) {
       routing_info_[it.Get()] = syncer::GROUP_PASSIVE;
       newly_added_types.Put(it.Get());
     }
   }
-  for (syncable::ModelTypeSet::Iterator it = types_to_remove.First();
+  for (syncer::ModelTypeSet::Iterator it = types_to_remove.First();
        it.Good(); it.Inc()) {
     routing_info_.erase(it.Get());
   }
 
   // TODO(akalin): Use SVLOG/SLOG if we add any more logging.
   DVLOG(1) << name_ << ": Adding types "
-           << syncable::ModelTypeSetToString(types_to_add)
+           << syncer::ModelTypeSetToString(types_to_add)
            << " (with newly-added types "
-           << syncable::ModelTypeSetToString(newly_added_types)
+           << syncer::ModelTypeSetToString(newly_added_types)
            << ") and removing types "
-           << syncable::ModelTypeSetToString(types_to_remove)
+           << syncer::ModelTypeSetToString(types_to_remove)
            << " to get new routing info "
            <<syncer::ModelSafeRoutingInfoToString(routing_info_);
 
   return newly_added_types;
 }
 
 void SyncBackendRegistrar::StopOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!stopped_on_ui_thread_);
   ui_worker_->Stop();
   stopped_on_ui_thread_ = true;
 }
 
 void SyncBackendRegistrar::OnSyncerShutdownComplete() {
   DCHECK_EQ(MessageLoop::current(), sync_loop_);
   ui_worker_->OnSyncerShutdownComplete();
 }
 
 void SyncBackendRegistrar::ActivateDataType(
-    syncable::ModelType type,
+    syncer::ModelType type,
     syncer::ModelSafeGroup group,
     ChangeProcessor* change_processor,
     syncer::UserShare* user_share) {
   CHECK(IsOnThreadForGroup(group));
   base::AutoLock lock(lock_);
   // Ensure that the given data type is in the PASSIVE group.
- syncer::ModelSafeRoutingInfo::iterator i = routing_info_.find(type);
+  syncer::ModelSafeRoutingInfo::iterator i = routing_info_.find(type);
   DCHECK(i != routing_info_.end());
   DCHECK_EQ(i->second, syncer::GROUP_PASSIVE);
   routing_info_[type] = group;
   CHECK(IsCurrentThreadSafeForModel(type));
 
   // Add the data type's change processor to the list of change
   // processors so it can receive updates.
   DCHECK_EQ(processors_.count(type), 0U);
   processors_[type] = change_processor;
 
   // Start the change processor.
   change_processor->Start(profile_, user_share);
   DCHECK(GetProcessorUnsafe(type));
 }
 
-void SyncBackendRegistrar::DeactivateDataType(syncable::ModelType type) {
+void SyncBackendRegistrar::DeactivateDataType(syncer::ModelType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::AutoLock lock(lock_);
   ChangeProcessor* change_processor = GetProcessorUnsafe(type);
   if (change_processor)
     change_processor->Stop();
 
   routing_info_.erase(type);
   ignore_result(processors_.erase(type));
   DCHECK(!GetProcessorUnsafe(type));
 }
 
 bool SyncBackendRegistrar::IsTypeActivatedForTest(
-    syncable::ModelType type) const {
+    syncer::ModelType type) const {
   return GetProcessor(type) != NULL;
 }
 
 void SyncBackendRegistrar::OnChangesApplied(
-    syncable::ModelType model_type,
+    syncer::ModelType model_type,
     const syncer::BaseTransaction* trans,
     const syncer::ImmutableChangeRecordList& changes) {
   ChangeProcessor* processor = GetProcessor(model_type);
   if (!processor)
     return;
 
   processor->ApplyChangesFromSyncModel(trans, changes);
 }
 
-void SyncBackendRegistrar::OnChangesComplete(
-    syncable::ModelType model_type) {
+void SyncBackendRegistrar::OnChangesComplete(syncer::ModelType model_type) {
   ChangeProcessor* processor = GetProcessor(model_type);
   if (!processor)
     return;
 
   // This call just notifies the processor that it can commit; it
   // already buffered any changes it plans to makes so needs no
   // further information.
   processor->CommitChangesFromSyncModel();
 }
 
 void SyncBackendRegistrar::GetWorkers(
     std::vector<syncer::ModelSafeWorker*>* out) {
   base::AutoLock lock(lock_);
   out->clear();
   for (WorkerMap::const_iterator it = workers_.begin();
        it != workers_.end(); ++it) {
     out->push_back(it->second);
   }
 }
 
 void SyncBackendRegistrar::GetModelSafeRoutingInfo(
-   syncer::ModelSafeRoutingInfo* out) {
+    syncer::ModelSafeRoutingInfo* out) {
   base::AutoLock lock(lock_);
- syncer::ModelSafeRoutingInfo copy(routing_info_);
+  syncer::ModelSafeRoutingInfo copy(routing_info_);
   out->swap(copy);
 }
 
 ChangeProcessor* SyncBackendRegistrar::GetProcessor(
-    syncable::ModelType type) const {
+    syncer::ModelType type) const {
   base::AutoLock lock(lock_);
   ChangeProcessor* processor = GetProcessorUnsafe(type);
   if (!processor)
     return NULL;
 
   // We can only check if |processor| exists, as otherwise the type is
   // mapped to syncer::GROUP_PASSIVE.
   CHECK(IsCurrentThreadSafeForModel(type));
   CHECK(processor->IsRunning());
   return processor;
 }
 
 ChangeProcessor* SyncBackendRegistrar::GetProcessorUnsafe(
-    syncable::ModelType type) const {
+    syncer::ModelType type) const {
   lock_.AssertAcquired();
-  std::map<syncable::ModelType, ChangeProcessor*>::const_iterator it =
+  std::map<syncer::ModelType, ChangeProcessor*>::const_iterator it =
       processors_.find(type);
 
   // Until model association happens for a datatype, it will not
   // appear in the processors list.  During this time, it is OK to
   // drop changes on the floor (since model association has not
   // happened yet).  When the data type is activated, model
   // association takes place then the change processor is added to the
   // |processors_| list.
   if (it == processors_.end())
     return NULL;
 
   return it->second;
 }
 
 bool SyncBackendRegistrar::IsCurrentThreadSafeForModel(
-    syncable::ModelType model_type) const {
+    syncer::ModelType model_type) const {
   lock_.AssertAcquired();
   return IsOnThreadForGroup(GetGroupForModelType(model_type, routing_info_));
 }
 
 }  // namespace browser_sync