[Sync] Put everything in sync/api into csync namespace

chrome/browser/extensions/settings/settings_backend.cc

Index: chrome/browser/extensions/settings/settings_backend.cc
diff --git a/chrome/browser/extensions/settings/settings_backend.cc b/chrome/browser/extensions/settings/settings_backend.cc
index c43dfdabb60a6ad08b08e4da0916cbc0634f0184..9f0fdb3144bbf10efd0f3e88889f8b3ee1d07873 100644
--- a/chrome/browser/extensions/settings/settings_backend.cc
+++ b/chrome/browser/extensions/settings/settings_backend.cc
@@ -74,7 +74,7 @@ SyncableSettingsStorage* SettingsBackend::GetOrCreateStorageWithSyncData(
   storage_objs_[extension_id] = syncable_storage;
 
   if (sync_processor_.get()) {
-    SyncError error =
+    csync::SyncError error =
         syncable_storage->StartSyncing(
             sync_data,
             CreateSettingsSyncProcessor(extension_id).Pass());
@@ -136,14 +136,14 @@ static void AddAllSyncData(
     const std::string& extension_id,
     const DictionaryValue& src,
     syncable::ModelType type,
-    SyncDataList* dst) {
+    csync::SyncDataList* dst) {
   for (DictionaryValue::Iterator it(src); it.HasNext(); it.Advance()) {
     dst->push_back(settings_sync_util::CreateData(
         extension_id, it.key(), it.value(), type));
   }
 }
 
-SyncDataList SettingsBackend::GetAllSyncData(
+csync::SyncDataList SettingsBackend::GetAllSyncData(
     syncable::ModelType type) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   // Ignore the type, it's just for sanity checking; assume that whatever base
@@ -153,7 +153,7 @@ SyncDataList SettingsBackend::GetAllSyncData(
 
   // For all extensions, get all their settings.  This has the effect
   // of bringing in the entire state of extension settings in memory; sad.
-  SyncDataList all_sync_data;
+  csync::SyncDataList all_sync_data;
   std::set<std::string> known_extension_ids(GetKnownExtensionIDs());
 
   for (std::set<std::string>::const_iterator it = known_extension_ids.begin();
@@ -171,11 +171,11 @@ SyncDataList SettingsBackend::GetAllSyncData(
   return all_sync_data;
 }
 
-SyncError SettingsBackend::MergeDataAndStartSyncing(
+csync::SyncError SettingsBackend::MergeDataAndStartSyncing(
     syncable::ModelType type,
-    const SyncDataList& initial_sync_data,
-    scoped_ptr<SyncChangeProcessor> sync_processor,
-    scoped_ptr<SyncErrorFactory> sync_error_factory) {
+    const csync::SyncDataList& initial_sync_data,
+    scoped_ptr<csync::SyncChangeProcessor> sync_processor,
+    scoped_ptr<csync::SyncErrorFactory> sync_error_factory) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(type == syncable::EXTENSION_SETTINGS ||
          type == syncable::APP_SETTINGS);
@@ -190,9 +190,9 @@ SyncError SettingsBackend::MergeDataAndStartSyncing(
 
   // Group the initial sync data by extension id.
   std::map<std::string, linked_ptr<DictionaryValue> > grouped_sync_data;
-  for (SyncDataList::const_iterator it = initial_sync_data.begin();
+  for (csync::SyncDataList::const_iterator it = initial_sync_data.begin();
       it != initial_sync_data.end(); ++it) {
-    SettingSyncData data(*it);
+    SettingSyncData  data(*it);

[asargent_no_longer_on_chrome, 2012/06/26 18:08:17]

nit: double space

[akalin, 2012/06/26 20:28:28]

Done.

     linked_ptr<DictionaryValue> sync_data =
         grouped_sync_data[data.extension_id()];
     if (!sync_data.get()) {
@@ -210,7 +210,7 @@ SyncError SettingsBackend::MergeDataAndStartSyncing(
       it != storage_objs_.end(); ++it) {
     std::map<std::string, linked_ptr<DictionaryValue> >::iterator
         maybe_sync_data = grouped_sync_data.find(it->first);
-    SyncError error;
+    csync::SyncError error;
     if (maybe_sync_data != grouped_sync_data.end()) {
       error = it->second->StartSyncing(
           *maybe_sync_data->second,
@@ -234,20 +234,20 @@ SyncError SettingsBackend::MergeDataAndStartSyncing(
     GetOrCreateStorageWithSyncData(it->first, *it->second);
   }
 
-  return SyncError();
+  return csync::SyncError();
 }
 
-SyncError SettingsBackend::ProcessSyncChanges(
+csync::SyncError SettingsBackend::ProcessSyncChanges(
     const tracked_objects::Location& from_here,
-    const SyncChangeList& sync_changes) {
+    const csync::SyncChangeList& sync_changes) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(sync_processor_.get());
 
   // Group changes by extension, to pass all changes in a single method call.
   std::map<std::string, SettingSyncDataList> grouped_sync_data;
-  for (SyncChangeList::const_iterator it = sync_changes.begin();
+  for (csync::SyncChangeList::const_iterator it = sync_changes.begin();
       it != sync_changes.end(); ++it) {
-    SettingSyncData data(*it);
+    SettingSyncData  data(*it);

[asargent_no_longer_on_chrome, 2012/06/26 18:08:17]

nit: double space

[akalin, 2012/06/26 20:28:28]

Done.

     grouped_sync_data[data.extension_id()].push_back(data);
   }
 
@@ -257,12 +257,12 @@ SyncError SettingsBackend::ProcessSyncChanges(
       it = grouped_sync_data.begin(); it != grouped_sync_data.end(); ++it) {
     SyncableSettingsStorage* storage =
         GetOrCreateStorageWithSyncData(it->first, empty);
-    SyncError error = storage->ProcessSyncChanges(it->second);
+    csync::SyncError error = storage->ProcessSyncChanges(it->second);
     if (error.IsSet())
       storage->StopSyncing();
   }
 
-  return SyncError();
+  return csync::SyncError();
 }
 
 void SettingsBackend::StopSyncing(syncable::ModelType type) {