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

chrome/browser/extensions/settings/settings_backend.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/extensions/settings/settings_backend.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 56 matching lines @@
   }
 
   linked_ptr<SyncableSettingsStorage> syncable_storage(
       new SyncableSettingsStorage(
           observers_,
           extension_id,
           storage));
   storage_objs_[extension_id] = syncable_storage;
 
   if (sync_processor_.get()) {
-    SyncError error =
+    csync::SyncError error =
         syncable_storage->StartSyncing(
             sync_data,
             CreateSettingsSyncProcessor(extension_id).Pass());
     if (error.IsSet())
       syncable_storage.get()->StopSyncing();
   }
 
   return syncable_storage.get();
 }
 
@@ skipping 41 matching lines @@
     }
   }
 
   return result;
 }
 
 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
   // path we're constructed with is correct for the sync type.
   DCHECK(type == syncable::EXTENSION_SETTINGS ||
          type == syncable::APP_SETTINGS);
 
   // 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();
       it != known_extension_ids.end(); ++it) {
     ValueStore::ReadResult maybe_settings = GetStorage(*it)->Get();
     if (maybe_settings->HasError()) {
       LOG(WARNING) << "Failed to get settings for " << *it << ": " <<
           maybe_settings->error();
       continue;
     }
     AddAllSyncData(*it, *maybe_settings->settings().get(),
                    type, &all_sync_data);
   }
 
   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);
   DCHECK_EQ(sync_type_, syncable::UNSPECIFIED);
   DCHECK(!sync_processor_.get());
   DCHECK(sync_processor.get());
   DCHECK(sync_error_factory.get());
 
   sync_type_ = type;
   sync_processor_ = sync_processor.Pass();
   sync_error_factory_ = sync_error_factory.Pass();
 
   // 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()) {
       sync_data = linked_ptr<DictionaryValue>(new DictionaryValue());
       grouped_sync_data[data.extension_id()] = sync_data;
     }
     DCHECK(!sync_data->HasKey(data.key())) <<
         "Duplicate settings for " << data.extension_id() << "/" << data.key();
     sync_data->Set(data.key(), data.value().DeepCopy());
   }
 
   // Start syncing all existing storage areas.  Any storage areas created in
   // the future will start being synced as part of the creation process.
   for (StorageObjMap::iterator it = storage_objs_.begin();
       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,
           CreateSettingsSyncProcessor(it->first).Pass());
       grouped_sync_data.erase(it->first);
     } else {
       DictionaryValue empty;
       error = it->second->StartSyncing(
           empty,
           CreateSettingsSyncProcessor(it->first).Pass());
     }
     if (error.IsSet())
       it->second->StopSyncing();
   }
 
   // Eagerly create and init the rest of the storage areas that have sync data.
   // Under normal circumstances (i.e. not first-time sync) this will be all of
   // them.
   for (std::map<std::string, linked_ptr<DictionaryValue> >::iterator it =
       grouped_sync_data.begin(); it != grouped_sync_data.end(); ++it) {
     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);
   }
 
   // Create any storage areas that don't exist yet but have sync data.
   DictionaryValue empty;
   for (std::map<std::string, SettingSyncDataList>::iterator
       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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(type == syncable::EXTENSION_SETTINGS ||
          type == syncable::APP_SETTINGS);
   DCHECK(sync_type_ == type || sync_type_ == syncable::UNSPECIFIED);
 
   for (StorageObjMap::iterator it = storage_objs_.begin();
       it != storage_objs_.end(); ++it) {
@@ skipping 10 matching lines @@
 scoped_ptr<SettingsSyncProcessor> SettingsBackend::CreateSettingsSyncProcessor(
     const std::string& extension_id) const {
   CHECK(sync_processor_.get());
   return scoped_ptr<SettingsSyncProcessor>(
       new SettingsSyncProcessor(extension_id,
                                 sync_type_,
                                 sync_processor_.get()));
 }
 
 }  // namespace extensions