diff options
Diffstat (limited to 'chrome/browser/extensions')
32 files changed, 699 insertions, 686 deletions
diff --git a/chrome/browser/extensions/app_notification_manager.cc b/chrome/browser/extensions/app_notification_manager.cc index 04d45c4..cf598e6 100644 --- a/chrome/browser/extensions/app_notification_manager.cc +++ b/chrome/browser/extensions/app_notification_manager.cc @@ -22,7 +22,7 @@ using content::BrowserThread; -typedef std::map<std::string, csync::SyncData> SyncDataMap; +typedef std::map<std::string, syncer::SyncData> SyncDataMap; namespace { @@ -54,9 +54,9 @@ void RemoveByGuid(AppNotificationList* list, const std::string& guid) { list->erase(iter); } -void PopulateGuidToSyncDataMap(const csync::SyncDataList& sync_data, +void PopulateGuidToSyncDataMap(const syncer::SyncDataList& sync_data, SyncDataMap* data_map) { - for (csync::SyncDataList::const_iterator iter = sync_data.begin(); + for (syncer::SyncDataList::const_iterator iter = sync_data.begin(); iter != sync_data.end(); ++iter) { (*data_map)[iter->GetSpecifics().app_notification().guid()] = *iter; } @@ -178,12 +178,12 @@ void AppNotificationManager::Observe( ClearAll(*content::Details<const std::string>(details).ptr()); } -csync::SyncDataList AppNotificationManager::GetAllSyncData( +syncer::SyncDataList AppNotificationManager::GetAllSyncData( syncable::ModelType type) const { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(loaded()); DCHECK_EQ(syncable::APP_NOTIFICATIONS, type); - csync::SyncDataList data; + syncer::SyncDataList data; for (NotificationMap::const_iterator iter = notifications_->begin(); iter != notifications_->end(); ++iter) { @@ -202,9 +202,9 @@ csync::SyncDataList AppNotificationManager::GetAllSyncData( return data; } -csync::SyncError AppNotificationManager::ProcessSyncChanges( +syncer::SyncError AppNotificationManager::ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) { + const syncer::SyncChangeList& change_list) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(loaded()); if (!models_associated_) { @@ -215,12 +215,12 @@ csync::SyncError AppNotificationManager::ProcessSyncChanges( AutoReset<bool> processing_changes(&processing_syncer_changes_, true); - csync::SyncError error; - for (csync::SyncChangeList::const_iterator iter = change_list.begin(); + syncer::SyncError error; + for (syncer::SyncChangeList::const_iterator iter = change_list.begin(); iter != change_list.end(); ++iter) { - csync::SyncData sync_data = iter->sync_data(); + syncer::SyncData sync_data = iter->sync_data(); DCHECK_EQ(syncable::APP_NOTIFICATIONS, sync_data.GetDataType()); - csync::SyncChange::SyncChangeType change_type = iter->change_type(); + syncer::SyncChange::SyncChangeType change_type = iter->change_type(); scoped_ptr<AppNotification> new_notif(CreateNotificationFromSyncData( sync_data)); @@ -235,12 +235,12 @@ csync::SyncError AppNotificationManager::ProcessSyncChanges( error = sync_error_factory_->CreateAndUploadError( FROM_HERE, "ProcessSyncChanges received a local only notification" + - csync::SyncChange::ChangeTypeToString(change_type)); + syncer::SyncChange::ChangeTypeToString(change_type)); continue; } switch (change_type) { - case csync::SyncChange::ACTION_ADD: + case syncer::SyncChange::ACTION_ADD: if (!existing_notif) { Add(new_notif.release()); } else { @@ -249,7 +249,7 @@ csync::SyncError AppNotificationManager::ProcessSyncChanges( << "\nItem in ADD change: " << new_notif->ToString(); } break; - case csync::SyncChange::ACTION_DELETE: + case syncer::SyncChange::ACTION_DELETE: if (existing_notif) { Remove(new_notif->extension_id(), new_notif->guid()); } else { @@ -260,7 +260,7 @@ csync::SyncError AppNotificationManager::ProcessSyncChanges( << "Item in DELETE change: " << new_notif->ToString(); } break; - case csync::SyncChange::ACTION_UPDATE: + case syncer::SyncChange::ACTION_UPDATE: // Although app notifications are immutable from the model perspective, // sync can send UPDATE changes due to encryption / meta-data changes. // So ignore UPDATE changes when the exitsing and new notification @@ -283,11 +283,11 @@ csync::SyncError AppNotificationManager::ProcessSyncChanges( return error; } -csync::SyncError AppNotificationManager::MergeDataAndStartSyncing( +syncer::SyncError AppNotificationManager::MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) { + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // AppNotificationDataTypeController ensures that modei is fully should before // this method is called by waiting until the load notification is received @@ -308,9 +308,9 @@ csync::SyncError AppNotificationManager::MergeDataAndStartSyncing( PopulateGuidToSyncDataMap(GetAllSyncData(syncable::APP_NOTIFICATIONS), &local_data_map); - for (csync::SyncDataList::const_iterator iter = initial_sync_data.begin(); + for (syncer::SyncDataList::const_iterator iter = initial_sync_data.begin(); iter != initial_sync_data.end(); ++iter) { - const csync::SyncData& sync_data = *iter; + const syncer::SyncData& sync_data = *iter; DCHECK_EQ(syncable::APP_NOTIFICATIONS, sync_data.GetDataType()); scoped_ptr<AppNotification> sync_notif(CreateNotificationFromSyncData( sync_data)); @@ -334,14 +334,14 @@ csync::SyncError AppNotificationManager::MergeDataAndStartSyncing( } // TODO(munjal): crbug.com/10059. Work with Lingesh/Antony to resolve. - csync::SyncChangeList new_changes; + syncer::SyncChangeList new_changes; for (SyncDataMap::const_iterator iter = local_data_map.begin(); iter != local_data_map.end(); ++iter) { new_changes.push_back( - csync::SyncChange(csync::SyncChange::ACTION_ADD, iter->second)); + syncer::SyncChange(syncer::SyncChange::ACTION_ADD, iter->second)); } - csync::SyncError error; + syncer::SyncError error; if (new_changes.size() > 0) error = sync_processor_->ProcessSyncChanges(FROM_HERE, new_changes); models_associated_ = !error.IsSet(); @@ -491,10 +491,10 @@ void AppNotificationManager::SyncAddChange(const AppNotification& notif) { // TODO(munjal): crbug.com/10059. Work with Lingesh/Antony to resolve. - csync::SyncChangeList changes; - csync::SyncData sync_data = CreateSyncDataFromNotification(notif); + syncer::SyncChangeList changes; + syncer::SyncData sync_data = CreateSyncDataFromNotification(notif); changes.push_back( - csync::SyncChange(csync::SyncChange::ACTION_ADD, sync_data)); + syncer::SyncChange(syncer::SyncChange::ACTION_ADD, sync_data)); sync_processor_->ProcessSyncChanges(FROM_HERE, changes); } @@ -506,10 +506,10 @@ void AppNotificationManager::SyncRemoveChange(const AppNotification& notif) { return; } - csync::SyncChangeList changes; - csync::SyncData sync_data = CreateSyncDataFromNotification(notif); + syncer::SyncChangeList changes; + syncer::SyncData sync_data = CreateSyncDataFromNotification(notif); changes.push_back( - csync::SyncChange(csync::SyncChange::ACTION_DELETE, sync_data)); + syncer::SyncChange(syncer::SyncChange::ACTION_DELETE, sync_data)); sync_processor_->ProcessSyncChanges(FROM_HERE, changes); } @@ -521,22 +521,22 @@ void AppNotificationManager::SyncClearAllChange( if (!models_associated_ || processing_syncer_changes_) return; - csync::SyncChangeList changes; + syncer::SyncChangeList changes; for (AppNotificationList::const_iterator iter = list.begin(); iter != list.end(); ++iter) { const AppNotification& notif = *iter->get(); // Skip notifications marked as local. if (notif.is_local()) continue; - changes.push_back(csync::SyncChange( - csync::SyncChange::ACTION_DELETE, + changes.push_back(syncer::SyncChange( + syncer::SyncChange::ACTION_DELETE, CreateSyncDataFromNotification(notif))); } sync_processor_->ProcessSyncChanges(FROM_HERE, changes); } // static -csync::SyncData AppNotificationManager::CreateSyncDataFromNotification( +syncer::SyncData AppNotificationManager::CreateSyncDataFromNotification( const AppNotification& notification) { DCHECK(!notification.is_local()); sync_pb::EntitySpecifics specifics; @@ -550,13 +550,13 @@ csync::SyncData AppNotificationManager::CreateSyncDataFromNotification( notif_specifics->set_link_text(notification.link_text()); notif_specifics->set_link_url(notification.link_url().spec()); notif_specifics->set_title(notification.title()); - return csync::SyncData::CreateLocalData( + return syncer::SyncData::CreateLocalData( notif_specifics->guid(), notif_specifics->app_id(), specifics); } // static AppNotification* AppNotificationManager::CreateNotificationFromSyncData( - const csync::SyncData& sync_data) { + const syncer::SyncData& sync_data) { sync_pb::AppNotification specifics = sync_data.GetSpecifics().app_notification(); diff --git a/chrome/browser/extensions/app_notification_manager.h b/chrome/browser/extensions/app_notification_manager.h index 9a84b5d..74104f3 100644 --- a/chrome/browser/extensions/app_notification_manager.h +++ b/chrome/browser/extensions/app_notification_manager.h @@ -26,7 +26,7 @@ class PerfTimer; class Profile; -namespace csync { +namespace syncer { class SyncErrorFactory; } @@ -36,7 +36,7 @@ class AppNotificationManager AppNotificationManager, content::BrowserThread::DeleteOnUIThread>, public content::NotificationObserver, - public csync::SyncableService { + public syncer::SyncableService { public: static const unsigned int kMaxNotificationPerApp; explicit AppNotificationManager(Profile* profile); @@ -64,22 +64,22 @@ class AppNotificationManager bool loaded() const { return notifications_.get() != NULL; } - // csync::SyncableService implementation. + // syncer::SyncableService implementation. - // Returns all syncable notifications from this model as csync::SyncData. - virtual csync::SyncDataList GetAllSyncData( + // Returns all syncable notifications from this model as syncer::SyncData. + virtual syncer::SyncDataList GetAllSyncData( syncable::ModelType type) const OVERRIDE; // Process notifications related changes from Sync, merging them into // our model. - virtual csync::SyncError ProcessSyncChanges( + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE; + const syncer::SyncChangeList& change_list) OVERRIDE; // Associate and merge sync data model with our data model. - virtual csync::SyncError MergeDataAndStartSyncing( + virtual syncer::SyncError MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) OVERRIDE; + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; virtual void StopSyncing(syncable::ModelType type) OVERRIDE; private: @@ -150,11 +150,11 @@ class AppNotificationManager // Sends changes to syncer to remove all notifications in the given list. void SyncClearAllChange(const AppNotificationList& list); - // Converters from AppNotification to csync::SyncData and vice versa. - static csync::SyncData CreateSyncDataFromNotification( + // Converters from AppNotification to syncer::SyncData and vice versa. + static syncer::SyncData CreateSyncDataFromNotification( const AppNotification& notification); static AppNotification* CreateNotificationFromSyncData( - const csync::SyncData& sync_data); + const syncer::SyncData& sync_data); Profile* profile_; content::NotificationRegistrar registrar_; @@ -164,10 +164,10 @@ class AppNotificationManager scoped_ptr<AppNotificationStorage> storage_; // Sync change processor we use to push all our changes. - scoped_ptr<csync::SyncChangeProcessor> sync_processor_; + scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; // Sync error handler that we use to create errors from. - scoped_ptr<csync::SyncErrorFactory> sync_error_factory_; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; // Whether the sync model is associated with the local model. // In other words, whether we are ready to apply sync changes. diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc index fc346d7..841754e 100644 --- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc @@ -22,36 +22,36 @@ using ::testing::Return; namespace { -// Extract notification guid from csync::SyncData. -std::string GetGuid(const csync::SyncData& sync_data) { +// Extract notification guid from syncer::SyncData. +std::string GetGuid(const syncer::SyncData& sync_data) { return sync_data.GetSpecifics().app_notification().guid(); } // Dummy SyncChangeProcessor used to help review what SyncChanges are pushed // back up to Sync. -class TestChangeProcessor : public csync::SyncChangeProcessor { +class TestChangeProcessor : public syncer::SyncChangeProcessor { public: TestChangeProcessor() { } virtual ~TestChangeProcessor() { } // Store a copy of all the changes passed in so we can examine them later. - virtual csync::SyncError ProcessSyncChanges( + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) { + const syncer::SyncChangeList& change_list) { // change_map_.erase(change_map_.begin(), change_map_.end()); - for (csync::SyncChangeList::const_iterator iter = change_list.begin(); + for (syncer::SyncChangeList::const_iterator iter = change_list.begin(); iter != change_list.end(); ++iter) { change_map_[GetGuid(iter->sync_data())] = *iter; } - return csync::SyncError(); + return syncer::SyncError(); } bool ContainsGuid(const std::string& guid) { return change_map_.find(guid) != change_map_.end(); } - csync::SyncChange GetChangeByGuid(const std::string& guid) { + syncer::SyncChange GetChangeByGuid(const std::string& guid) { DCHECK(ContainsGuid(guid)); return change_map_[guid]; } @@ -60,29 +60,29 @@ class TestChangeProcessor : public csync::SyncChangeProcessor { private: // Track the changes received in ProcessSyncChanges. - std::map<std::string, csync::SyncChange> change_map_; + std::map<std::string, syncer::SyncChange> change_map_; DISALLOW_COPY_AND_ASSIGN(TestChangeProcessor); }; -class SyncChangeProcessorDelegate : public csync::SyncChangeProcessor { +class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor { public: - explicit SyncChangeProcessorDelegate(csync::SyncChangeProcessor* recipient) + explicit SyncChangeProcessorDelegate(syncer::SyncChangeProcessor* recipient) : recipient_(recipient) { DCHECK(recipient_); } virtual ~SyncChangeProcessorDelegate() {} - // csync::SyncChangeProcessor implementation. - virtual csync::SyncError ProcessSyncChanges( + // syncer::SyncChangeProcessor implementation. + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) OVERRIDE { return recipient_->ProcessSyncChanges(from_here, change_list); } private: // The recipient of all sync changes. - csync::SyncChangeProcessor* recipient_; + syncer::SyncChangeProcessor* recipient_; DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate); }; @@ -135,8 +135,8 @@ class AppNotificationManagerSyncTest : public testing::Test { AppNotificationManager* model() { return model_.get(); } TestChangeProcessor* processor() { return sync_processor_.get(); } - scoped_ptr<csync::SyncChangeProcessor> PassProcessor() { - return sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(); + scoped_ptr<syncer::SyncChangeProcessor> PassProcessor() { + return sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(); } // Creates a notification whose properties are set from the given integer. @@ -188,29 +188,29 @@ class AppNotificationManagerSyncTest : public testing::Test { return notif; } - static csync::SyncData CreateSyncData(int suffix) { + static syncer::SyncData CreateSyncData(int suffix) { scoped_ptr<AppNotification> notif(CreateNotification(suffix)); return AppNotificationManager::CreateSyncDataFromNotification(*notif); } - static csync::SyncData CreateSyncData( + static syncer::SyncData CreateSyncData( int suffix, const std::string& extension_id) { scoped_ptr<AppNotification> notif( CreateNotification(false, suffix, extension_id)); return AppNotificationManager::CreateSyncDataFromNotification(*notif); } - // Helper to create csync::SyncChange. Takes ownership of |notif|. - static csync::SyncChange CreateSyncChange( - csync::SyncChange::SyncChangeType type, + // Helper to create syncer::SyncChange. Takes ownership of |notif|. + static syncer::SyncChange CreateSyncChange( + syncer::SyncChange::SyncChangeType type, AppNotification* notif) { // Take control of notif to clean it up after we create data out of it. scoped_ptr<AppNotification> scoped_notif(notif); - return csync::SyncChange( + return syncer::SyncChange( type, AppNotificationManager::CreateSyncDataFromNotification(*notif)); } - void AssertSyncChange(const csync::SyncChange& change, - csync::SyncChange::SyncChangeType type, + void AssertSyncChange(const syncer::SyncChange& change, + syncer::SyncChange::SyncChangeType type, const AppNotification& notif) { ASSERT_EQ(type, change.change_type()); scoped_ptr<AppNotification> notif2( @@ -235,11 +235,11 @@ class AppNotificationManagerSyncTest : public testing::Test { DISALLOW_COPY_AND_ASSIGN(AppNotificationManagerSyncTest); }; -// Create an AppNotification, convert it to csync::SyncData and convert it back. +// Create an AppNotification, convert it to SyncData and convert it back. TEST_F(AppNotificationManagerSyncTest, NotificationToSyncDataToNotification) { { // Partial properties set. scoped_ptr<AppNotification> notif1(CreateNotificationNoLink(1)); - csync::SyncData sync_data = + syncer::SyncData sync_data = AppNotificationManager::CreateSyncDataFromNotification(*notif1); scoped_ptr<AppNotification> notif2( AppNotificationManager::CreateNotificationFromSyncData(sync_data)); @@ -248,7 +248,7 @@ TEST_F(AppNotificationManagerSyncTest, NotificationToSyncDataToNotification) { } { // All properties set. scoped_ptr<AppNotification> notif1(CreateNotification(1)); - csync::SyncData sync_data = + syncer::SyncData sync_data = AppNotificationManager::CreateSyncDataFromNotification(*notif1); scoped_ptr<AppNotification> notif2( AppNotificationManager::CreateNotificationFromSyncData(sync_data)); @@ -262,12 +262,12 @@ TEST_F(AppNotificationManagerSyncTest, GetAllSyncDataNoLocal) { model()->Add(CreateNotificationNoLink(1)); model()->Add(CreateNotification(2)); model()->Add(CreateNotification(3)); - csync::SyncDataList all_sync_data = + syncer::SyncDataList all_sync_data = model()->GetAllSyncData(syncable::APP_NOTIFICATIONS); EXPECT_EQ(3U, all_sync_data.size()); - for (csync::SyncDataList::const_iterator iter = all_sync_data.begin(); + for (syncer::SyncDataList::const_iterator iter = all_sync_data.begin(); iter != all_sync_data.end(); ++iter) { scoped_ptr<AppNotification> notif1( AppNotificationManager::CreateNotificationFromSyncData(*iter)); @@ -287,12 +287,12 @@ TEST_F(AppNotificationManagerSyncTest, GetAllSyncDataSomeLocal) { model()->Add(CreateNotification(3)); model()->Add(CreateNotification(true, 4)); model()->Add(CreateNotification(5)); - csync::SyncDataList all_sync_data = + syncer::SyncDataList all_sync_data = model()->GetAllSyncData(syncable::APP_NOTIFICATIONS); EXPECT_EQ(3U, all_sync_data.size()); - for (csync::SyncDataList::const_iterator iter = all_sync_data.begin(); + for (syncer::SyncDataList::const_iterator iter = all_sync_data.begin(); iter != all_sync_data.end(); ++iter) { scoped_ptr<AppNotification> notif1( AppNotificationManager::CreateNotificationFromSyncData(*iter)); @@ -308,9 +308,9 @@ TEST_F(AppNotificationManagerSyncTest, GetAllSyncDataSomeLocal) { TEST_F(AppNotificationManagerSyncTest, ModelAssocBothEmpty) { model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), // Empty. + syncer::SyncDataList(), // Empty. PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ(0U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); EXPECT_EQ(0U, processor()->change_list_size()); @@ -318,7 +318,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothEmpty) { // Model assocation: empty sync model and non-empty local model. TEST_F(AppNotificationManagerSyncTest, ModelAssocModelEmpty) { - csync::SyncDataList initial_data; + syncer::SyncDataList initial_data; initial_data.push_back(CreateSyncData(1)); initial_data.push_back(CreateSyncData(2)); initial_data.push_back(CreateSyncData(3)); @@ -328,11 +328,11 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocModelEmpty) { syncable::APP_NOTIFICATIONS, initial_data, PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ(4U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); // Model should all of the initial sync data. - for (csync::SyncDataList::const_iterator iter = initial_data.begin(); + for (syncer::SyncDataList::const_iterator iter = initial_data.begin(); iter != initial_data.end(); ++iter) { scoped_ptr<AppNotification> notif1( AppNotificationManager::CreateNotificationFromSyncData(*iter)); @@ -356,7 +356,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyNoOverlap) { AppNotification* n3 = CreateNotification(3); model()->Add(n3); - csync::SyncDataList initial_data; + syncer::SyncDataList initial_data; initial_data.push_back(CreateSyncData(4)); initial_data.push_back(CreateSyncData(5)); initial_data.push_back(CreateSyncData(6)); @@ -366,10 +366,10 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyNoOverlap) { syncable::APP_NOTIFICATIONS, initial_data, PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ(6U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); - for (csync::SyncDataList::const_iterator iter = initial_data.begin(); + for (syncer::SyncDataList::const_iterator iter = initial_data.begin(); iter != initial_data.end(); ++iter) { scoped_ptr<AppNotification> notif1( AppNotificationManager::CreateNotificationFromSyncData(*iter)); @@ -385,11 +385,11 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyNoOverlap) { EXPECT_EQ(2U, processor()->change_list_size()); EXPECT_TRUE(processor()->ContainsGuid(n1->guid())); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, processor()->GetChangeByGuid(n1->guid()).change_type()); EXPECT_FALSE(processor()->ContainsGuid(n2->guid())); EXPECT_TRUE(processor()->ContainsGuid(n3->guid())); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, processor()->GetChangeByGuid(n3->guid()).change_type()); } @@ -405,7 +405,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptySomeOverlap) { AppNotification* n4 = CreateNotification(4); model()->Add(n4); - csync::SyncDataList initial_data; + syncer::SyncDataList initial_data; initial_data.push_back(CreateSyncData(5)); initial_data.push_back( AppNotificationManager::CreateSyncDataFromNotification(*n1)); @@ -418,10 +418,10 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptySomeOverlap) { syncable::APP_NOTIFICATIONS, initial_data, PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ(6U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); - for (csync::SyncDataList::const_iterator iter = initial_data.begin(); + for (syncer::SyncDataList::const_iterator iter = initial_data.begin(); iter != initial_data.end(); ++iter) { scoped_ptr<AppNotification> notif1( AppNotificationManager::CreateNotificationFromSyncData(*iter)); @@ -440,7 +440,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptySomeOverlap) { EXPECT_FALSE(processor()->ContainsGuid(n1->guid())); EXPECT_FALSE(processor()->ContainsGuid(n2->guid())); EXPECT_TRUE(processor()->ContainsGuid(n3->guid())); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, processor()->GetChangeByGuid(n3->guid()).change_type()); EXPECT_FALSE(processor()->ContainsGuid(n4->guid())); } @@ -453,7 +453,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyTitleMismatch) { AppNotification* n2 = CreateNotification(true, 2); model()->Add(n2); - csync::SyncDataList initial_data; + syncer::SyncDataList initial_data; initial_data.push_back(CreateSyncData(1)); scoped_ptr<AppNotification> n1_a(CreateNotification( n1->is_local(), n1->creation_time().ToInternalValue(), @@ -463,19 +463,19 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyTitleMismatch) { initial_data.push_back( AppNotificationManager::CreateSyncDataFromNotification(*n1_a)); - scoped_ptr<csync::SyncErrorFactoryMock> error_handler( - new csync::SyncErrorFactoryMock()); + scoped_ptr<syncer::SyncErrorFactoryMock> error_handler( + new syncer::SyncErrorFactoryMock()); EXPECT_CALL(*error_handler, CreateAndUploadError(_, _)). WillOnce( Return( - csync::SyncError( + syncer::SyncError( FROM_HERE, "error", syncable::APP_NOTIFICATIONS))); - csync::SyncError sync_error = model()->MergeDataAndStartSyncing( + syncer::SyncError sync_error = model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, initial_data, PassProcessor(), - error_handler.PassAs<csync::SyncErrorFactory>()); + error_handler.PassAs<syncer::SyncErrorFactory>()); EXPECT_TRUE(sync_error.IsSet()); EXPECT_EQ(syncable::APP_NOTIFICATIONS, sync_error.type()); @@ -490,25 +490,25 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyMatchesLocal) { AppNotification* n2 = CreateNotification(true, 2); model()->Add(n2); - csync::SyncDataList initial_data; + syncer::SyncDataList initial_data; initial_data.push_back(CreateSyncData(1)); scoped_ptr<AppNotification> n2_a(CreateNotification(2)); initial_data.push_back( AppNotificationManager::CreateSyncDataFromNotification(*n2_a)); - scoped_ptr<csync::SyncErrorFactoryMock> error_handler( - new csync::SyncErrorFactoryMock()); + scoped_ptr<syncer::SyncErrorFactoryMock> error_handler( + new syncer::SyncErrorFactoryMock()); EXPECT_CALL(*error_handler, CreateAndUploadError(_, _)). WillOnce( Return( - csync::SyncError( + syncer::SyncError( FROM_HERE, "error", syncable::APP_NOTIFICATIONS))); - csync::SyncError sync_error = model()->MergeDataAndStartSyncing( + syncer::SyncError sync_error = model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, initial_data, PassProcessor(), - error_handler.PassAs<csync::SyncErrorFactory>()); + error_handler.PassAs<syncer::SyncErrorFactory>()); EXPECT_TRUE(sync_error.IsSet()); EXPECT_EQ(syncable::APP_NOTIFICATIONS, sync_error.type()); @@ -520,18 +520,18 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesEmptyModel) { // We initially have no data. model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Set up a bunch of ADDs. - csync::SyncChangeList changes; + syncer::SyncChangeList changes; changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(1))); + syncer::SyncChange::ACTION_ADD, CreateNotification(1))); changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(2))); + syncer::SyncChange::ACTION_ADD, CreateNotification(2))); changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(3))); + syncer::SyncChange::ACTION_ADD, CreateNotification(3))); model()->ProcessSyncChanges(FROM_HERE, changes); @@ -547,18 +547,18 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesNonEmptyModel) { model()->Add(n2); model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Some adds and some deletes. - csync::SyncChangeList changes; + syncer::SyncChangeList changes; changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(3))); + syncer::SyncChange::ACTION_ADD, CreateNotification(3))); changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_DELETE, n1->Copy())); + syncer::SyncChange::ACTION_DELETE, n1->Copy())); changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(4))); + syncer::SyncChange::ACTION_ADD, CreateNotification(4))); model()->ProcessSyncChanges(FROM_HERE, changes); @@ -574,16 +574,16 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesIgnoreBadAdd) { model()->Add(n2); model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Some adds and some deletes. - csync::SyncChangeList changes; + syncer::SyncChangeList changes; changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(1))); + syncer::SyncChange::ACTION_ADD, CreateNotification(1))); - csync::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes); + syncer::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes); EXPECT_FALSE(error.IsSet()); EXPECT_EQ(2U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); @@ -598,16 +598,16 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesIgnoreBadDelete) { model()->Add(n2); model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Some adds and some deletes. - csync::SyncChangeList changes; + syncer::SyncChangeList changes; changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_DELETE, CreateNotification(3))); + syncer::SyncChange::ACTION_DELETE, CreateNotification(3))); - csync::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes); + syncer::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes); EXPECT_FALSE(error.IsSet()); EXPECT_EQ(2U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); @@ -622,20 +622,20 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesIgnoreBadUpdates) { model()->Add(n2); model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Some adds and some deletes. - csync::SyncChangeList changes; + syncer::SyncChangeList changes; changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_UPDATE, CreateNotification(3))); + syncer::SyncChange::ACTION_UPDATE, CreateNotification(3))); AppNotification* n2_changed = n2->Copy(); n2_changed->set_link_text(n2_changed->link_text() + "-changed"); changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_UPDATE, n2_changed)); + syncer::SyncChange::ACTION_UPDATE, n2_changed)); - csync::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes); + syncer::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes); EXPECT_FALSE(error.IsSet()); EXPECT_EQ(2U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size()); @@ -647,14 +647,14 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesEmptyModelWithMax) { const std::string& ext_id = "e1"; model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); for (unsigned int i = 0; i < AppNotificationManager::kMaxNotificationPerApp * 2; i++) { - csync::SyncChangeList changes; + syncer::SyncChangeList changes; changes.push_back(CreateSyncChange( - csync::SyncChange::ACTION_ADD, CreateNotification(false, i, ext_id))); + syncer::SyncChange::ACTION_ADD, CreateNotification(false, i, ext_id))); model()->ProcessSyncChanges(FROM_HERE, changes); if (i < AppNotificationManager::kMaxNotificationPerApp) { EXPECT_EQ(i + 1, @@ -678,9 +678,9 @@ TEST_F(AppNotificationManagerSyncTest, StopSyncing) { model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_TRUE(model()->sync_processor_.get()); EXPECT_TRUE(model()->models_associated_); @@ -694,9 +694,9 @@ TEST_F(AppNotificationManagerSyncTest, StopSyncing) { TEST_F(AppNotificationManagerSyncTest, AddsGetsSynced) { model()->MergeDataAndStartSyncing( syncable::APP_NOTIFICATIONS, - csync::SyncDataList(), + syncer::SyncDataList(), PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); AppNotification* n1 = CreateNotification(1); model()->Add(n1); @@ -707,10 +707,10 @@ TEST_F(AppNotificationManagerSyncTest, AddsGetsSynced) { EXPECT_EQ(2U, processor()->change_list_size()); EXPECT_TRUE(processor()->ContainsGuid(n1->guid())); - csync::SyncChange c1 = processor()->GetChangeByGuid(n1->guid()); - AssertSyncChange(c1, csync::SyncChange::ACTION_ADD, *n1); - csync::SyncChange c2 = processor()->GetChangeByGuid(n2->guid()); - AssertSyncChange(c2, csync::SyncChange::ACTION_ADD, *n2); + syncer::SyncChange c1 = processor()->GetChangeByGuid(n1->guid()); + AssertSyncChange(c1, syncer::SyncChange::ACTION_ADD, *n1); + syncer::SyncChange c2 = processor()->GetChangeByGuid(n2->guid()); + AssertSyncChange(c2, syncer::SyncChange::ACTION_ADD, *n2); } // Clear all gets pushed to sync. @@ -721,7 +721,7 @@ TEST_F(AppNotificationManagerSyncTest, ClearAllGetsSynced) { scoped_ptr<AppNotification> n3(CreateNotification(false, 3, ext_id)); scoped_ptr<AppNotification> n4(CreateNotification(4)); - csync::SyncDataList initial_data; + syncer::SyncDataList initial_data; initial_data.push_back( AppNotificationManager::CreateSyncDataFromNotification(*n1)); initial_data.push_back( @@ -734,16 +734,16 @@ TEST_F(AppNotificationManagerSyncTest, ClearAllGetsSynced) { syncable::APP_NOTIFICATIONS, initial_data, PassProcessor(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); model()->ClearAll(ext_id); EXPECT_EQ(3U, processor()->change_list_size()); EXPECT_TRUE(processor()->ContainsGuid(n1->guid())); - csync::SyncChange c1 = processor()->GetChangeByGuid(n1->guid()); - AssertSyncChange(c1, csync::SyncChange::ACTION_DELETE, *n1); - csync::SyncChange c2 = processor()->GetChangeByGuid(n2->guid()); - AssertSyncChange(c2, csync::SyncChange::ACTION_DELETE, *n2); - csync::SyncChange c3 = processor()->GetChangeByGuid(n3->guid()); - AssertSyncChange(c3, csync::SyncChange::ACTION_DELETE, *n3); + syncer::SyncChange c1 = processor()->GetChangeByGuid(n1->guid()); + AssertSyncChange(c1, syncer::SyncChange::ACTION_DELETE, *n1); + syncer::SyncChange c2 = processor()->GetChangeByGuid(n2->guid()); + AssertSyncChange(c2, syncer::SyncChange::ACTION_DELETE, *n2); + syncer::SyncChange c3 = processor()->GetChangeByGuid(n3->guid()); + AssertSyncChange(c3, syncer::SyncChange::ACTION_DELETE, *n3); } diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc index 79bd765..af26282 100644 --- a/chrome/browser/extensions/app_sync_bundle.cc +++ b/chrome/browser/extensions/app_sync_bundle.cc @@ -20,13 +20,14 @@ AppSyncBundle::AppSyncBundle(ExtensionService* extension_service) AppSyncBundle::~AppSyncBundle() {} -void AppSyncBundle::SetupSync(csync::SyncChangeProcessor* sync_change_processor, - csync::SyncErrorFactory* sync_error_factory, - const csync::SyncDataList& initial_sync_data) { +void AppSyncBundle::SetupSync( + syncer::SyncChangeProcessor* sync_change_processor, + syncer::SyncErrorFactory* sync_error_factory, + const syncer::SyncDataList& initial_sync_data) { sync_processor_.reset(sync_change_processor); sync_error_factory_.reset(sync_error_factory); - for (csync::SyncDataList::const_iterator i = initial_sync_data.begin(); + for (syncer::SyncDataList::const_iterator i = initial_sync_data.begin(); i != initial_sync_data.end(); ++i) { AppSyncData app_sync_data(*i); @@ -42,34 +43,34 @@ void AppSyncBundle::Reset() { pending_sync_data_.clear(); } -csync::SyncChange AppSyncBundle::CreateSyncChangeToDelete( +syncer::SyncChange AppSyncBundle::CreateSyncChangeToDelete( const Extension* extension) const { AppSyncData sync_data = extension_service_->GetAppSyncData(*extension); - return sync_data.GetSyncChange(csync::SyncChange::ACTION_DELETE); + return sync_data.GetSyncChange(syncer::SyncChange::ACTION_DELETE); } void AppSyncBundle::ProcessDeletion(std::string extension_id, - const csync::SyncChange& sync_change) { + const syncer::SyncChange& sync_change) { RemoveApp(extension_id); sync_processor_->ProcessSyncChanges(FROM_HERE, - csync::SyncChangeList(1, sync_change)); + syncer::SyncChangeList(1, sync_change)); } -csync::SyncChange AppSyncBundle::CreateSyncChange( - const csync::SyncData& sync_data) { +syncer::SyncChange AppSyncBundle::CreateSyncChange( + const syncer::SyncData& sync_data) { if (HasExtensionId(sync_data.GetTag())) { - return csync::SyncChange(csync::SyncChange::ACTION_UPDATE, sync_data); + return syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE, sync_data); } else { AddApp(sync_data.GetTag()); - return csync::SyncChange(csync::SyncChange::ACTION_ADD, sync_data); + return syncer::SyncChange(syncer::SyncChange::ACTION_ADD, sync_data); } } -csync::SyncDataList AppSyncBundle::GetAllSyncData() const { +syncer::SyncDataList AppSyncBundle::GetAllSyncData() const { std::vector<AppSyncData> app_sync_data = extension_service_->GetAppSyncDataList(); - csync::SyncDataList result(app_sync_data.size()); + syncer::SyncDataList result(app_sync_data.size()); for (int i = 0; i < static_cast<int>(app_sync_data.size()); ++i) { result[i] = app_sync_data[i].GetSyncData(); } @@ -79,9 +80,9 @@ csync::SyncDataList AppSyncBundle::GetAllSyncData() const { void AppSyncBundle::SyncChangeIfNeeded(const Extension& extension) { AppSyncData app_sync_data = extension_service_->GetAppSyncData(extension); - csync::SyncChangeList sync_change_list(1, app_sync_data.GetSyncChange( + syncer::SyncChangeList sync_change_list(1, app_sync_data.GetSyncChange( HasExtensionId(extension.id()) ? - csync::SyncChange::ACTION_UPDATE : csync::SyncChange::ACTION_ADD)); + syncer::SyncChange::ACTION_UPDATE : syncer::SyncChange::ACTION_ADD)); sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); MarkPendingAppSynced(extension.id()); } @@ -95,7 +96,7 @@ void AppSyncBundle::ProcessSyncChange(AppSyncData app_sync_data) { } void AppSyncBundle::ProcessSyncChangeList( - csync::SyncChangeList sync_change_list) { + syncer::SyncChangeList sync_change_list) { sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); extension_service_->extension_prefs()->extension_sorting()-> FixNTPOrdinalCollisions(); diff --git a/chrome/browser/extensions/app_sync_bundle.h b/chrome/browser/extensions/app_sync_bundle.h index 7088139..0e8635c 100644 --- a/chrome/browser/extensions/app_sync_bundle.h +++ b/chrome/browser/extensions/app_sync_bundle.h @@ -19,7 +19,7 @@ class ExtensionService; class ExtensionSet; -namespace csync { +namespace syncer { class SyncChangeProcessor; class SyncErrorFactory; } @@ -35,26 +35,26 @@ class AppSyncBundle { virtual ~AppSyncBundle(); // Setup this bundle to be sync application data. - void SetupSync(csync::SyncChangeProcessor* sync_proccessor, - csync::SyncErrorFactory* sync_error_factory, - const csync::SyncDataList& initial_sync_data); + void SetupSync(syncer::SyncChangeProcessor* sync_proccessor, + syncer::SyncErrorFactory* sync_error_factory, + const syncer::SyncDataList& initial_sync_data); // Resets this class back to it default values, which will disable all syncing // until a new sync processor is set. void Reset(); - // Returns a csync::SyncChange that will delete the given application. - csync::SyncChange CreateSyncChangeToDelete(const Extension* extension) const; + // Returns a syncer::SyncChange that will delete the given application. + syncer::SyncChange CreateSyncChangeToDelete(const Extension* extension) const; // Process the sync deletion of the given application. void ProcessDeletion( - std::string extension_id, const csync::SyncChange& sync_change); + std::string extension_id, const syncer::SyncChange& sync_change); // Create a sync change based on |sync_data|. - csync::SyncChange CreateSyncChange(const csync::SyncData& sync_data); + syncer::SyncChange CreateSyncChange(const syncer::SyncData& sync_data); // Get all the sync data contained in this bundle. - csync::SyncDataList GetAllSyncData() const; + syncer::SyncDataList GetAllSyncData() const; // Sync a newly-installed application or change an existing one. void SyncChangeIfNeeded(const Extension& extension); @@ -63,7 +63,7 @@ class AppSyncBundle { void ProcessSyncChange(AppSyncData app_sync_data); // Process the list of sync changes. - void ProcessSyncChangeList(csync::SyncChangeList sync_change_list); + void ProcessSyncChangeList(syncer::SyncChangeList sync_change_list); // Check to see if the given |id| is either synced or pending to be synced. bool HasExtensionId(const std::string& id) const; @@ -95,8 +95,8 @@ class AppSyncBundle { void MarkPendingAppSynced(const std::string& id); ExtensionService* extension_service_; // Own us. - scoped_ptr<csync::SyncChangeProcessor> sync_processor_; - scoped_ptr<csync::SyncErrorFactory> sync_error_factory_; + scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; std::set<std::string> synced_apps_; std::map<std::string, AppSyncData> pending_sync_data_; diff --git a/chrome/browser/extensions/app_sync_data.cc b/chrome/browser/extensions/app_sync_data.cc index 62927ee..babdedc 100644 --- a/chrome/browser/extensions/app_sync_data.cc +++ b/chrome/browser/extensions/app_sync_data.cc @@ -13,16 +13,16 @@ namespace extensions { AppSyncData::AppSyncData() : notifications_disabled_(false) {} -AppSyncData::AppSyncData(const csync::SyncData& sync_data) +AppSyncData::AppSyncData(const syncer::SyncData& sync_data) : notifications_disabled_(false) { PopulateFromSyncData(sync_data); } -AppSyncData::AppSyncData(const csync::SyncChange& sync_change) +AppSyncData::AppSyncData(const syncer::SyncChange& sync_change) : notifications_disabled_(false) { PopulateFromSyncData(sync_change.sync_data()); extension_sync_data_.set_uninstalled( - sync_change.change_type() == csync::SyncChange::ACTION_DELETE); + sync_change.change_type() == syncer::SyncChange::ACTION_DELETE); } AppSyncData::AppSyncData(const Extension& extension, @@ -41,18 +41,18 @@ AppSyncData::AppSyncData(const Extension& extension, AppSyncData::~AppSyncData() {} -csync::SyncData AppSyncData::GetSyncData() const { +syncer::SyncData AppSyncData::GetSyncData() const { sync_pb::EntitySpecifics specifics; PopulateAppSpecifics(specifics.mutable_app()); - return csync::SyncData::CreateLocalData(extension_sync_data_.id(), + return syncer::SyncData::CreateLocalData(extension_sync_data_.id(), extension_sync_data_.name(), specifics); } -csync::SyncChange AppSyncData::GetSyncChange( - csync::SyncChange::SyncChangeType change_type) const { - return csync::SyncChange(change_type, GetSyncData()); +syncer::SyncChange AppSyncData::GetSyncChange( + syncer::SyncChange::SyncChangeType change_type) const { + return syncer::SyncChange(change_type, GetSyncData()); } void AppSyncData::PopulateAppSpecifics(sync_pb::AppSpecifics* specifics) const { @@ -92,7 +92,7 @@ void AppSyncData::PopulateFromAppSpecifics( page_ordinal_ = StringOrdinal(specifics.page_ordinal()); } -void AppSyncData::PopulateFromSyncData(const csync::SyncData& sync_data) { +void AppSyncData::PopulateFromSyncData(const syncer::SyncData& sync_data) { PopulateFromAppSpecifics(sync_data.GetSpecifics().app()); } diff --git a/chrome/browser/extensions/app_sync_data.h b/chrome/browser/extensions/app_sync_data.h index 353acd5..bf830cf 100644 --- a/chrome/browser/extensions/app_sync_data.h +++ b/chrome/browser/extensions/app_sync_data.h @@ -10,7 +10,7 @@ #include "chrome/common/string_ordinal.h" #include "sync/api/sync_change.h" -namespace csync { +namespace syncer { class SyncData; } @@ -27,8 +27,8 @@ class ExtensionSyncData; class AppSyncData { public: AppSyncData(); - explicit AppSyncData(const csync::SyncData& sync_data); - explicit AppSyncData(const csync::SyncChange& sync_change); + explicit AppSyncData(const syncer::SyncData& sync_data); + explicit AppSyncData(const syncer::SyncChange& sync_change); AppSyncData(const Extension& extension, bool enabled, bool incognito_enabled, @@ -39,9 +39,9 @@ class AppSyncData { ~AppSyncData(); // Retrive sync data from this class. - csync::SyncData GetSyncData() const; - csync::SyncChange GetSyncChange( - csync::SyncChange::SyncChangeType change_type) const; + syncer::SyncData GetSyncData() const; + syncer::SyncChange GetSyncChange( + syncer::SyncChange::SyncChangeType change_type) const; const std::string& id() const { return extension_sync_data_.id(); } @@ -73,7 +73,7 @@ class AppSyncData { // Populate this class from sync inputs. void PopulateFromAppSpecifics( const sync_pb::AppSpecifics& specifics); - void PopulateFromSyncData(const csync::SyncData& sync_data); + void PopulateFromSyncData(const syncer::SyncData& sync_data); ExtensionSyncData extension_sync_data_; std::string notifications_client_id_; diff --git a/chrome/browser/extensions/app_sync_data_unittest.cc b/chrome/browser/extensions/app_sync_data_unittest.cc index b7397e0..18f676f 100644 --- a/chrome/browser/extensions/app_sync_data_unittest.cc +++ b/chrome/browser/extensions/app_sync_data_unittest.cc @@ -51,8 +51,8 @@ TEST_F(AppSyncDataTest, SyncDataToExtensionSyncDataForApp) { SetRequiredExtensionValues(app_specifics->mutable_extension()); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); AppSyncData app_sync_data(sync_data); EXPECT_EQ(app_specifics->app_launch_ordinal(), @@ -81,11 +81,11 @@ TEST_F(AppSyncDataTest, ExtensionSyncDataToSyncDataForApp) { SetRequiredExtensionValues(input_specifics->mutable_extension()); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); AppSyncData app_sync_data(sync_data); - csync::SyncData output_sync_data = app_sync_data.GetSyncData(); + syncer::SyncData output_sync_data = app_sync_data.GetSyncData(); EXPECT_TRUE(sync_data.GetSpecifics().has_app()); const sync_pb::AppSpecifics& output_specifics = output_sync_data.GetSpecifics().app(); @@ -108,8 +108,8 @@ TEST_F(AppSyncDataTest, ExtensionSyncDataInvalidOrdinal) { SetRequiredExtensionValues(app_specifics->mutable_extension()); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); // There should be no issue loading the sync data. AppSyncData app_sync_data(sync_data); diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 8ca041b..d2830b8 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -706,7 +706,7 @@ bool ExtensionService::UninstallExtension( // Extract the data we need for sync now, but don't actually sync until we've // completed the uninstallation. - csync::SyncChange sync_change; + syncer::SyncChange sync_change; if (app_sync_bundle_.HandlesApp(*extension)) { sync_change = app_sync_bundle_.CreateSyncChangeToDelete(extension); } else if (extension_sync_bundle_.HandlesExtension(*extension)) { @@ -1191,11 +1191,11 @@ void ExtensionService::CheckForUpdatesSoon() { } } -csync::SyncError ExtensionService::MergeDataAndStartSyncing( +syncer::SyncError ExtensionService::MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) { + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) { CHECK(sync_processor.get()); CHECK(sync_error_factory.get()); @@ -1219,9 +1219,9 @@ csync::SyncError ExtensionService::MergeDataAndStartSyncing( // Process local extensions. // TODO(yoz): Determine whether pending extensions should be considered too. // See crbug.com/104399. - csync::SyncDataList sync_data_list = GetAllSyncData(type); - csync::SyncChangeList sync_change_list; - for (csync::SyncDataList::const_iterator i = sync_data_list.begin(); + syncer::SyncDataList sync_data_list = GetAllSyncData(type); + syncer::SyncChangeList sync_change_list; + for (syncer::SyncDataList::const_iterator i = sync_data_list.begin(); i != sync_data_list.end(); ++i) { switch (type) { @@ -1244,7 +1244,7 @@ csync::SyncError ExtensionService::MergeDataAndStartSyncing( app_sync_bundle_.ProcessSyncChangeList(sync_change_list); } - return csync::SyncError(); + return syncer::SyncError(); } void ExtensionService::StopSyncing(syncable::ModelType type) { @@ -1255,7 +1255,7 @@ void ExtensionService::StopSyncing(syncable::ModelType type) { } } -csync::SyncDataList ExtensionService::GetAllSyncData( +syncer::SyncDataList ExtensionService::GetAllSyncData( syncable::ModelType type) const { if (type == syncable::EXTENSIONS) { return extension_sync_bundle_.GetAllSyncData(); @@ -1267,13 +1267,13 @@ csync::SyncDataList ExtensionService::GetAllSyncData( // We should only get sync data for extensions and apps. NOTREACHED(); - return csync::SyncDataList(); + return syncer::SyncDataList(); } -csync::SyncError ExtensionService::ProcessSyncChanges( +syncer::SyncError ExtensionService::ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) { - for (csync::SyncChangeList::const_iterator i = change_list.begin(); + const syncer::SyncChangeList& change_list) { + for (syncer::SyncChangeList::const_iterator i = change_list.begin(); i != change_list.end(); ++i) { syncable::ModelType type = i->sync_data().GetDataType(); @@ -1287,7 +1287,7 @@ csync::SyncError ExtensionService::ProcessSyncChanges( extension_prefs()->extension_sorting()->FixNTPOrdinalCollisions(); - return csync::SyncError(); + return syncer::SyncError(); } extensions::ExtensionSyncData ExtensionService::GetExtensionSyncData( diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 9e27b3a..eb23402 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -72,7 +72,7 @@ class ExtensionBluetoothEventRouter; class ExtensionInputMethodEventRouter; } -namespace csync { +namespace syncer { class SyncData; class SyncErrorFactory; } @@ -91,7 +91,7 @@ class WebNavigationEventRouter; // This is an interface class to encapsulate the dependencies that // various classes have on ExtensionService. This allows easy mocking. -class ExtensionServiceInterface : public csync::SyncableService { +class ExtensionServiceInterface : public syncer::SyncableService { public: // A function that returns true if the given extension should be // included and false if it should be filtered out. Identical to @@ -421,18 +421,18 @@ class ExtensionService virtual void CheckForUpdatesSoon() OVERRIDE; - // csync::SyncableService implementation. - virtual csync::SyncError MergeDataAndStartSyncing( + // syncer::SyncableService implementation. + virtual syncer::SyncError MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) OVERRIDE; + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; virtual void StopSyncing(syncable::ModelType type) OVERRIDE; - virtual csync::SyncDataList GetAllSyncData( + virtual syncer::SyncDataList GetAllSyncData( syncable::ModelType type) const OVERRIDE; - virtual csync::SyncError ProcessSyncChanges( + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE; + const syncer::SyncChangeList& change_list) OVERRIDE; // Gets the sync data for the given extension, assuming that the extension is // syncable. @@ -619,7 +619,7 @@ class ExtensionService AppShortcutManager* app_shortcut_manager() { return &app_shortcut_manager_; } - // Specialization of csync::SyncableService::AsWeakPtr. + // Specialization of syncer::SyncableService::AsWeakPtr. base::WeakPtr<ExtensionService> AsWeakPtr() { return base::AsWeakPtr(this); } private: diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index a7991f5..e55a254 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -4208,11 +4208,11 @@ TEST_F(ExtensionServiceTest, ComponentExtensions) { } namespace { - class TestSyncProcessorStub : public csync::SyncChangeProcessor { - virtual csync::SyncError ProcessSyncChanges( + class TestSyncProcessorStub : public syncer::SyncChangeProcessor { + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE { - return csync::SyncError(); + const syncer::SyncChangeList& change_list) OVERRIDE { + return syncer::SyncError(); } }; } @@ -4224,11 +4224,11 @@ TEST_F(ExtensionServiceTest, GetSyncData) { ASSERT_TRUE(extension); service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 1U); extensions::ExtensionSyncData data(list[0]); EXPECT_EQ(extension->id(), data.id()); @@ -4249,11 +4249,11 @@ TEST_F(ExtensionServiceTest, GetSyncDataTerminated) { TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 1U); extensions::ExtensionSyncData data(list[0]); EXPECT_EQ(extension->id(), data.id()); @@ -4272,11 +4272,11 @@ TEST_F(ExtensionServiceTest, GetSyncDataFilter) { ASSERT_TRUE(extension); TestSyncProcessorStub processor; - service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 0U); } @@ -4288,12 +4288,12 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) { TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 1U); extensions::ExtensionSyncData data(list[0]); EXPECT_TRUE(data.enabled()); @@ -4302,7 +4302,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) { service_->DisableExtension(good_crx, Extension::DISABLE_USER_ACTION); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 1U); extensions::ExtensionSyncData data(list[0]); EXPECT_FALSE(data.enabled()); @@ -4311,7 +4311,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) { service_->SetIsIncognitoEnabled(good_crx, true); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 1U); extensions::ExtensionSyncData data(list[0]); EXPECT_FALSE(data.enabled()); @@ -4320,7 +4320,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) { service_->EnableExtension(good_crx); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS); ASSERT_EQ(list.size(), 1U); extensions::ExtensionSyncData data(list[0]); EXPECT_TRUE(data.enabled()); @@ -4337,9 +4337,9 @@ TEST_F(ExtensionServiceTest, SyncForUninstalledExternalExtension) { TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); UninstallExtension(good_crx, false); EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); @@ -4352,10 +4352,10 @@ TEST_F(ExtensionServiceTest, SyncForUninstalledExternalExtension) { extension_specifics->set_version("1.0"); extension_specifics->set_enabled(true); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); @@ -4370,13 +4370,13 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { ASSERT_TRUE(app->is_app()); TestSyncProcessorStub processor; - service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal(); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS); ASSERT_EQ(list.size(), 1U); extensions::AppSyncData app_sync_data(list[0]); @@ -4387,7 +4387,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting(); sorting->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter()); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS); ASSERT_EQ(list.size(), 1U); extensions::AppSyncData app_sync_data(list[0]); @@ -4397,7 +4397,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { sorting->SetPageOrdinal(app->id(), initial_ordinal.CreateAfter()); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS); ASSERT_EQ(list.size(), 1U); extensions::AppSyncData app_sync_data(list[0]); @@ -4419,13 +4419,13 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) { } TestSyncProcessorStub processor; - service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); service_->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id()); { - csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS); + syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS); ASSERT_EQ(list.size(), 3U); extensions::AppSyncData data[kAppCount]; @@ -4458,13 +4458,13 @@ TEST_F(ExtensionServiceTest, GetSyncDataList) { InstallCRX(data_dir_.AppendASCII("theme2.crx"), INSTALL_NEW); TestSyncProcessorStub processor; - service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); service_->DisableExtension(page_action, Extension::DISABLE_USER_ACTION); TerminateExtension(theme2_crx); @@ -4477,18 +4477,18 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) { InitializeEmptyExtensionService(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); sync_pb::EntitySpecifics specifics; sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); ext_specifics->set_id(good_crx); ext_specifics->set_version("1.0"); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_DELETE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change(syncer::SyncChange::ACTION_DELETE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; // Should do nothing. @@ -4527,10 +4527,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataWrongType) { { extension_specifics->set_enabled(true); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_DELETE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_DELETE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; // Should do nothing @@ -4540,10 +4541,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataWrongType) { { extension_specifics->set_enabled(false); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; // Should again do nothing. @@ -4557,9 +4559,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) { InitializeExtensionProcessManager(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW); EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); @@ -4573,10 +4575,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) { ext_specifics->set_enabled(false); { - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); @@ -4586,10 +4589,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) { { ext_specifics->set_enabled(true); ext_specifics->set_incognito_enabled(true); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); @@ -4599,10 +4603,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) { { ext_specifics->set_enabled(false); ext_specifics->set_incognito_enabled(true); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); EXPECT_FALSE(service_->IsExtensionEnabled(good_crx)); @@ -4616,9 +4621,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) { InitializeExtensionServiceWithUpdater(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW); TerminateExtension(good_crx); @@ -4632,10 +4637,10 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) { service_->GetInstalledExtension(good_crx)->version()->GetString()); ext_specifics->set_enabled(false); ext_specifics->set_incognito_enabled(true); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); @@ -4650,9 +4655,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) { InitializeRequestContext(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW); EXPECT_TRUE(service_->IsExtensionEnabled(good_crx)); @@ -4666,10 +4671,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) { { ext_specifics->set_version( service_->GetInstalledExtension(good_crx)->version()->GetString()); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; // Should do nothing if extension version == sync version. @@ -4681,10 +4687,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) { // the TODO in ProcessExtensionSyncData). { ext_specifics->set_version("0.0.0.0"); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); @@ -4694,10 +4701,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) { // Should kick off an update if extension version < sync version. { ext_specifics->set_version("9.9.9.9"); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change( + syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; service_->ProcessSyncChanges(FROM_HERE, list); @@ -4712,9 +4720,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) { InitializeRequestContext(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing( - syncable::EXTENSIONS, csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncable::EXTENSIONS, syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); sync_pb::EntitySpecifics specifics; sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension(); @@ -4723,10 +4731,10 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) { ext_specifics->set_incognito_enabled(true); ext_specifics->set_update_url("http://www.google.com/"); ext_specifics->set_version("1.2.3.4"); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData(good_crx, "Name", specifics); - csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data); - csync::SyncChangeList list(1); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); + syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data); + syncer::SyncChangeList list(1); list[0] = sync_change; diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc index 37fa530..91c71bb 100644 --- a/chrome/browser/extensions/extension_sync_bundle.cc +++ b/chrome/browser/extensions/extension_sync_bundle.cc @@ -20,13 +20,13 @@ ExtensionSyncBundle::ExtensionSyncBundle(ExtensionService* extension_service) ExtensionSyncBundle::~ExtensionSyncBundle() {} void ExtensionSyncBundle::SetupSync( - csync::SyncChangeProcessor* sync_processor, - csync::SyncErrorFactory* sync_error_factory, - const csync::SyncDataList& initial_sync_data) { + syncer::SyncChangeProcessor* sync_processor, + syncer::SyncErrorFactory* sync_error_factory, + const syncer::SyncDataList& initial_sync_data) { sync_processor_.reset(sync_processor); sync_error_factory_.reset(sync_error_factory); - for (csync::SyncDataList::const_iterator i = initial_sync_data.begin(); + for (syncer::SyncDataList::const_iterator i = initial_sync_data.begin(); i != initial_sync_data.end(); ++i) { ExtensionSyncData extension_sync_data(*i); @@ -42,34 +42,34 @@ void ExtensionSyncBundle::Reset() { pending_sync_data_.clear(); } -csync::SyncChange ExtensionSyncBundle::CreateSyncChangeToDelete( +syncer::SyncChange ExtensionSyncBundle::CreateSyncChangeToDelete( const Extension* extension) const { extensions::ExtensionSyncData sync_data = extension_service_->GetExtensionSyncData(*extension); - return sync_data.GetSyncChange(csync::SyncChange::ACTION_DELETE); + return sync_data.GetSyncChange(syncer::SyncChange::ACTION_DELETE); } void ExtensionSyncBundle::ProcessDeletion( - std::string extension_id, const csync::SyncChange& sync_change) { + std::string extension_id, const syncer::SyncChange& sync_change) { RemoveExtension(extension_id); sync_processor_->ProcessSyncChanges(FROM_HERE, - csync::SyncChangeList(1, sync_change)); + syncer::SyncChangeList(1, sync_change)); } -csync::SyncChange ExtensionSyncBundle::CreateSyncChange( - const csync::SyncData& sync_data) { +syncer::SyncChange ExtensionSyncBundle::CreateSyncChange( + const syncer::SyncData& sync_data) { if (HasExtensionId(sync_data.GetTag())) { - return csync::SyncChange(csync::SyncChange::ACTION_UPDATE, sync_data); + return syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE, sync_data); } else { AddExtension(sync_data.GetTag()); - return csync::SyncChange(csync::SyncChange::ACTION_ADD, sync_data); + return syncer::SyncChange(syncer::SyncChange::ACTION_ADD, sync_data); } } -csync::SyncDataList ExtensionSyncBundle::GetAllSyncData() const { +syncer::SyncDataList ExtensionSyncBundle::GetAllSyncData() const { std::vector<ExtensionSyncData> extension_sync_data = extension_service_->GetExtensionSyncDataList(); - csync::SyncDataList result(extension_sync_data.size()); + syncer::SyncDataList result(extension_sync_data.size()); for (int i = 0; i < static_cast<int>(extension_sync_data.size()); ++i) { result[i] = extension_sync_data[i].GetSyncData(); } @@ -80,9 +80,9 @@ void ExtensionSyncBundle::SyncChangeIfNeeded(const Extension& extension) { ExtensionSyncData extension_sync_data = extension_service_->GetExtensionSyncData(extension); - csync::SyncChangeList sync_change_list(1, extension_sync_data.GetSyncChange( + syncer::SyncChangeList sync_change_list(1, extension_sync_data.GetSyncChange( HasExtensionId(extension.id()) ? - csync::SyncChange::ACTION_UPDATE : csync::SyncChange::ACTION_ADD)); + syncer::SyncChange::ACTION_UPDATE : syncer::SyncChange::ACTION_ADD)); sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); MarkPendingExtensionSynced(extension.id()); } @@ -97,7 +97,7 @@ void ExtensionSyncBundle::ProcessSyncChange( } void ExtensionSyncBundle::ProcessSyncChangeList( - csync::SyncChangeList sync_change_list) { + syncer::SyncChangeList sync_change_list) { sync_processor_->ProcessSyncChanges(FROM_HERE, sync_change_list); } diff --git a/chrome/browser/extensions/extension_sync_bundle.h b/chrome/browser/extensions/extension_sync_bundle.h index 6c4fe1b..ec29d76 100644 --- a/chrome/browser/extensions/extension_sync_bundle.h +++ b/chrome/browser/extensions/extension_sync_bundle.h @@ -19,7 +19,7 @@ class ExtensionService; class ExtensionSet; -namespace csync { +namespace syncer { class SyncChangeProcessor; class SyncErrorFactory; } @@ -35,26 +35,26 @@ class ExtensionSyncBundle { ~ExtensionSyncBundle(); // Setup this bundle to be sync extension data. - void SetupSync(csync::SyncChangeProcessor* sync_processor, - csync::SyncErrorFactory* sync_error_factory, - const csync::SyncDataList& initial_sync_data); + void SetupSync(syncer::SyncChangeProcessor* sync_processor, + syncer::SyncErrorFactory* sync_error_factory, + const syncer::SyncDataList& initial_sync_data); // Resets this class back to it default values, which will disable all syncing // until a new sync processor is set. void Reset(); - // Returns a csync::SyncChange that will delete the given extension. - csync::SyncChange CreateSyncChangeToDelete(const Extension* extension) const; + // Returns a syncer::SyncChange that will delete the given extension. + syncer::SyncChange CreateSyncChangeToDelete(const Extension* extension) const; // Process the sync deletion of the given extension. void ProcessDeletion( - std::string extension_id, const csync::SyncChange& sync_change); + std::string extension_id, const syncer::SyncChange& sync_change); // Create a sync change based on |sync_data|. - csync::SyncChange CreateSyncChange(const csync::SyncData& sync_data); + syncer::SyncChange CreateSyncChange(const syncer::SyncData& sync_data); // Get all the sync data contained in this bundle. - csync::SyncDataList GetAllSyncData() const; + syncer::SyncDataList GetAllSyncData() const; // Process the given sync change and apply it. void ProcessSyncChange(ExtensionSyncData extension_sync_data); @@ -63,7 +63,7 @@ class ExtensionSyncBundle { void SyncChangeIfNeeded(const Extension& extension); // Process the list of sync changes. - void ProcessSyncChangeList(csync::SyncChangeList sync_change_list); + void ProcessSyncChangeList(syncer::SyncChangeList sync_change_list); // Check to see if the given |id| is either synced or pending to be synced. bool HasExtensionId(const std::string& id) const; @@ -95,8 +95,8 @@ class ExtensionSyncBundle { void MarkPendingExtensionSynced(const std::string& id); ExtensionService* extension_service_; // Owns us. - scoped_ptr<csync::SyncChangeProcessor> sync_processor_; - scoped_ptr<csync::SyncErrorFactory> sync_error_factory_; + scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; std::set<std::string> synced_extensions_; std::map<std::string, ExtensionSyncData> pending_sync_data_; diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc index ced1cbf..d395b19 100644 --- a/chrome/browser/extensions/extension_sync_data.cc +++ b/chrome/browser/extensions/extension_sync_data.cc @@ -20,16 +20,16 @@ ExtensionSyncData::ExtensionSyncData() incognito_enabled_(false) { } -ExtensionSyncData::ExtensionSyncData(const csync::SyncData& sync_data) +ExtensionSyncData::ExtensionSyncData(const syncer::SyncData& sync_data) : uninstalled_(false), enabled_(false), incognito_enabled_(false) { PopulateFromSyncData(sync_data); } -ExtensionSyncData::ExtensionSyncData(const csync::SyncChange& sync_change) +ExtensionSyncData::ExtensionSyncData(const syncer::SyncChange& sync_change) : uninstalled_( - sync_change.change_type() == csync::SyncChange::ACTION_DELETE), + sync_change.change_type() == syncer::SyncChange::ACTION_DELETE), enabled_(false), incognito_enabled_(false) { PopulateFromSyncData(sync_change.sync_data()); @@ -49,16 +49,16 @@ ExtensionSyncData::ExtensionSyncData(const Extension& extension, ExtensionSyncData::~ExtensionSyncData() {} -csync::SyncData ExtensionSyncData::GetSyncData() const { +syncer::SyncData ExtensionSyncData::GetSyncData() const { sync_pb::EntitySpecifics specifics; PopulateExtensionSpecifics(specifics.mutable_extension()); - return csync::SyncData::CreateLocalData(id_, name_, specifics); + return syncer::SyncData::CreateLocalData(id_, name_, specifics); } -csync::SyncChange ExtensionSyncData::GetSyncChange( - csync::SyncChange::SyncChangeType change_type) const { - return csync::SyncChange(change_type, GetSyncData()); +syncer::SyncChange ExtensionSyncData::GetSyncChange( + syncer::SyncChange::SyncChangeType change_type) const { + return syncer::SyncChange(change_type, GetSyncData()); } void ExtensionSyncData::PopulateExtensionSpecifics( @@ -100,7 +100,8 @@ void ExtensionSyncData::set_uninstalled(bool uninstalled) { uninstalled_ = uninstalled; } -void ExtensionSyncData::PopulateFromSyncData(const csync::SyncData& sync_data) { +void ExtensionSyncData::PopulateFromSyncData( + const syncer::SyncData& sync_data) { const sync_pb::EntitySpecifics& entity_specifics = sync_data.GetSpecifics(); if (entity_specifics.has_extension()) { diff --git a/chrome/browser/extensions/extension_sync_data.h b/chrome/browser/extensions/extension_sync_data.h index bbd3cdd..3b54f57 100644 --- a/chrome/browser/extensions/extension_sync_data.h +++ b/chrome/browser/extensions/extension_sync_data.h @@ -13,7 +13,7 @@ #include "googleurl/src/gurl.h" #include "sync/api/sync_change.h" -namespace csync { +namespace syncer { class SyncData; } @@ -29,17 +29,17 @@ class Extension; class ExtensionSyncData { public: ExtensionSyncData(); - explicit ExtensionSyncData(const csync::SyncData& sync_data); - explicit ExtensionSyncData(const csync::SyncChange& sync_change); + explicit ExtensionSyncData(const syncer::SyncData& sync_data); + explicit ExtensionSyncData(const syncer::SyncChange& sync_change); ExtensionSyncData(const Extension& extension, bool enabled, bool incognito_enabled); ~ExtensionSyncData(); // Retrieve sync data from this class. - csync::SyncData GetSyncData() const; - csync::SyncChange GetSyncChange( - csync::SyncChange::SyncChangeType change_type) const; + syncer::SyncData GetSyncData() const; + syncer::SyncChange GetSyncChange( + syncer::SyncChange::SyncChangeType change_type) const; // Convert an ExtensionSyncData back out to a sync structure. void PopulateExtensionSpecifics(sync_pb::ExtensionSpecifics* specifics) const; @@ -68,7 +68,7 @@ class ExtensionSyncData { private: // Populate this class from sync inputs. - void PopulateFromSyncData(const csync::SyncData& sync_data); + void PopulateFromSyncData(const syncer::SyncData& sync_data); std::string id_; bool uninstalled_; diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc index 5ccdf63..df8d11a 100644 --- a/chrome/browser/extensions/extension_sync_data_unittest.cc +++ b/chrome/browser/extensions/extension_sync_data_unittest.cc @@ -44,8 +44,8 @@ TEST_F(ExtensionSyncDataTest, SyncDataToExtensionSyncDataForExtension) { extension_specifics->set_incognito_enabled(true); extension_specifics->set_version(kVersion1); extension_specifics->set_name(kName); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); extensions::ExtensionSyncData extension_sync_data(sync_data); EXPECT_EQ(extension_specifics->id(), extension_sync_data.id()); @@ -69,11 +69,11 @@ TEST_F(ExtensionSyncDataTest, ExtensionSyncDataToSyncDataForExtension) { input_extension->set_incognito_enabled(false); input_extension->set_version(kVersion1); input_extension->set_name(kName); - csync::SyncData sync_data = - csync::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); + syncer::SyncData sync_data = + syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); extensions::ExtensionSyncData extension_sync_data(sync_data); - csync::SyncData output_sync_data = extension_sync_data.GetSyncData(); + syncer::SyncData output_sync_data = extension_sync_data.GetSyncData(); const sync_pb::ExtensionSpecifics& output_specifics = output_sync_data.GetSpecifics().extension(); EXPECT_EQ(extension_sync_data.id(), output_specifics.id()); diff --git a/chrome/browser/extensions/settings/setting_sync_data.cc b/chrome/browser/extensions/settings/setting_sync_data.cc index 54546b4..4baf04c 100644 --- a/chrome/browser/extensions/settings/setting_sync_data.cc +++ b/chrome/browser/extensions/settings/setting_sync_data.cc @@ -14,18 +14,18 @@ namespace extensions { SettingSyncData::SettingSyncData( - const csync::SyncChange& sync_change) { + const syncer::SyncChange& sync_change) { Init(sync_change.change_type(), sync_change.sync_data()); } SettingSyncData::SettingSyncData( - const csync::SyncData& sync_data) { - Init(csync::SyncChange::ACTION_INVALID, sync_data); + const syncer::SyncData& sync_data) { + Init(syncer::SyncChange::ACTION_INVALID, sync_data); } void SettingSyncData::Init( - csync::SyncChange::SyncChangeType change_type, - const csync::SyncData& sync_data) { + syncer::SyncChange::SyncChangeType change_type, + const syncer::SyncData& sync_data) { DCHECK(!internal_.get()); sync_pb::EntitySpecifics specifics = sync_data.GetSpecifics(); // The data must only be either extension or app specfics. @@ -43,7 +43,7 @@ void SettingSyncData::Init( } void SettingSyncData::InitFromExtensionSettingSpecifics( - csync::SyncChange::SyncChangeType change_type, + syncer::SyncChange::SyncChangeType change_type, const sync_pb::ExtensionSettingSpecifics& specifics) { DCHECK(!internal_.get()); scoped_ptr<Value> value( @@ -61,7 +61,7 @@ void SettingSyncData::InitFromExtensionSettingSpecifics( } SettingSyncData::SettingSyncData( - csync::SyncChange::SyncChangeType change_type, + syncer::SyncChange::SyncChangeType change_type, const std::string& extension_id, const std::string& key, scoped_ptr<Value> value) @@ -69,7 +69,7 @@ SettingSyncData::SettingSyncData( SettingSyncData::~SettingSyncData() {} -csync::SyncChange::SyncChangeType SettingSyncData::change_type() const { +syncer::SyncChange::SyncChangeType SettingSyncData::change_type() const { return internal_->change_type_; } @@ -86,7 +86,7 @@ const Value& SettingSyncData::value() const { } SettingSyncData::Internal::Internal( - csync::SyncChange::SyncChangeType change_type, + syncer::SyncChange::SyncChangeType change_type, const std::string& extension_id, const std::string& key, scoped_ptr<Value> value) diff --git a/chrome/browser/extensions/settings/setting_sync_data.h b/chrome/browser/extensions/settings/setting_sync_data.h index 070e3ee..72957a5 100644 --- a/chrome/browser/extensions/settings/setting_sync_data.h +++ b/chrome/browser/extensions/settings/setting_sync_data.h @@ -11,7 +11,7 @@ #include "base/values.h" #include "sync/api/sync_change.h" -namespace csync { +namespace syncer { class SyncData; } @@ -26,14 +26,14 @@ namespace extensions { class SettingSyncData { public: // Creates from a sync change. - explicit SettingSyncData(const csync::SyncChange& sync_change); + explicit SettingSyncData(const syncer::SyncChange& sync_change); // Creates from sync data. |change_type| will be ACTION_INVALID. - explicit SettingSyncData(const csync::SyncData& sync_data); + explicit SettingSyncData(const syncer::SyncData& sync_data); // Creates explicitly. SettingSyncData( - csync::SyncChange::SyncChangeType change_type, + syncer::SyncChange::SyncChangeType change_type, const std::string& extension_id, const std::string& key, scoped_ptr<Value> value); @@ -41,7 +41,7 @@ class SettingSyncData { ~SettingSyncData(); // Returns the type of the sync change; may be ACTION_INVALID. - csync::SyncChange::SyncChangeType change_type() const; + syncer::SyncChange::SyncChangeType change_type() const; // Returns the extension id the setting is for. const std::string& extension_id() const; @@ -58,12 +58,12 @@ class SettingSyncData { class Internal : public base::RefCountedThreadSafe<Internal> { public: Internal( - csync::SyncChange::SyncChangeType change_type, + syncer::SyncChange::SyncChangeType change_type, const std::string& extension_id, const std::string& key, scoped_ptr<Value> value); - csync::SyncChange::SyncChangeType change_type_; + syncer::SyncChange::SyncChangeType change_type_; std::string extension_id_; std::string key_; scoped_ptr<Value> value_; @@ -74,12 +74,12 @@ class SettingSyncData { }; // Initializes internal_ from sync data for an extension or app setting. - void Init(csync::SyncChange::SyncChangeType change_type, - const csync::SyncData& sync_data); + void Init(syncer::SyncChange::SyncChangeType change_type, + const syncer::SyncData& sync_data); // Initializes internal_ from extension specifics. void InitFromExtensionSettingSpecifics( - csync::SyncChange::SyncChangeType change_type, + syncer::SyncChange::SyncChangeType change_type, const sync_pb::ExtensionSettingSpecifics& specifics); scoped_refptr<Internal> internal_; diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc index 32f1128..b2a336c 100644 --- a/chrome/browser/extensions/settings/settings_apitest.cc +++ b/chrome/browser/extensions/settings/settings_apitest.cc @@ -33,35 +33,35 @@ namespace { // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS. const syncable::ModelType kModelType = syncable::EXTENSION_SETTINGS; -class NoopSyncChangeProcessor : public csync::SyncChangeProcessor { +class NoopSyncChangeProcessor : public syncer::SyncChangeProcessor { public: - virtual csync::SyncError ProcessSyncChanges( + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE { - return csync::SyncError(); + const syncer::SyncChangeList& change_list) OVERRIDE { + return syncer::SyncError(); } virtual ~NoopSyncChangeProcessor() {}; }; -class SyncChangeProcessorDelegate : public csync::SyncChangeProcessor { +class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor { public: - explicit SyncChangeProcessorDelegate(csync::SyncChangeProcessor* recipient) + explicit SyncChangeProcessorDelegate(syncer::SyncChangeProcessor* recipient) : recipient_(recipient) { DCHECK(recipient_); } virtual ~SyncChangeProcessorDelegate() {} - // csync::SyncChangeProcessor implementation. - virtual csync::SyncError ProcessSyncChanges( + // syncer::SyncChangeProcessor implementation. + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) OVERRIDE { return recipient_->ProcessSyncChanges(from_here, change_list); } private: // The recipient of all sync changes. - csync::SyncChangeProcessor* recipient_; + syncer::SyncChangeProcessor* recipient_; DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate); }; @@ -99,7 +99,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest { settings_namespace, normal_action, incognito_action, NULL, true); } - void InitSync(csync::SyncChangeProcessor* sync_processor) { + void InitSync(syncer::SyncChangeProcessor* sync_processor) { MessageLoop::current()->RunAllPending(); InitSyncWithSyncableService( sync_processor, @@ -107,7 +107,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest { GetBackendForSync(kModelType)); } - void SendChanges(const csync::SyncChangeList& change_list) { + void SendChanges(const syncer::SyncChangeList& change_list) { MessageLoop::current()->RunAllPending(); SendChangesToSyncableService( change_list, @@ -159,20 +159,20 @@ class ExtensionSettingsApiTest : public ExtensionApiTest { } void InitSyncWithSyncableService( - csync::SyncChangeProcessor* sync_processor, - csync::SyncableService* settings_service) { + syncer::SyncChangeProcessor* sync_processor, + syncer::SyncableService* settings_service) { EXPECT_FALSE(settings_service->MergeDataAndStartSyncing( kModelType, - csync::SyncDataList(), - scoped_ptr<csync::SyncChangeProcessor>( + syncer::SyncDataList(), + scoped_ptr<syncer::SyncChangeProcessor>( new SyncChangeProcessorDelegate(sync_processor)), - scoped_ptr<csync::SyncErrorFactory>( - new csync::SyncErrorFactoryMock())).IsSet()); + scoped_ptr<syncer::SyncErrorFactory>( + new syncer::SyncErrorFactoryMock())).IsSet()); } void SendChangesToSyncableService( - const csync::SyncChangeList& change_list, - csync::SyncableService* settings_service) { + const syncer::SyncChangeList& change_list, + syncer::SyncableService* settings_service) { EXPECT_FALSE( settings_service->ProcessSyncChanges(FROM_HERE, change_list).IsSet()); } @@ -315,7 +315,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, InitSync(&sync_processor); // Set "foo" to "bar" via sync. - csync::SyncChangeList sync_changes; + syncer::SyncChangeList sync_changes; StringValue bar("bar"); sync_changes.push_back(settings_sync_util::CreateAdd( extension_id, "foo", bar, kModelType)); @@ -363,7 +363,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, InitSync(&sync_processor); // Set "foo" to "bar" via sync. - csync::SyncChangeList sync_changes; + syncer::SyncChangeList sync_changes; StringValue bar("bar"); sync_changes.push_back(settings_sync_util::CreateAdd( extension_id, "foo", bar, kModelType)); diff --git a/chrome/browser/extensions/settings/settings_backend.cc b/chrome/browser/extensions/settings/settings_backend.cc index dee0f7b..617cff6 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()) { - csync::SyncError error = + syncer::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, - csync::SyncDataList* dst) { + syncer::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)); } } -csync::SyncDataList SettingsBackend::GetAllSyncData( +syncer::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 @@ csync::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. - csync::SyncDataList all_sync_data; + syncer::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 @@ csync::SyncDataList SettingsBackend::GetAllSyncData( return all_sync_data; } -csync::SyncError SettingsBackend::MergeDataAndStartSyncing( +syncer::SyncError SettingsBackend::MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) { + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(type == syncable::EXTENSION_SETTINGS || type == syncable::APP_SETTINGS); @@ -190,7 +190,7 @@ csync::SyncError SettingsBackend::MergeDataAndStartSyncing( // Group the initial sync data by extension id. std::map<std::string, linked_ptr<DictionaryValue> > grouped_sync_data; - for (csync::SyncDataList::const_iterator it = initial_sync_data.begin(); + for (syncer::SyncDataList::const_iterator it = initial_sync_data.begin(); it != initial_sync_data.end(); ++it) { SettingSyncData data(*it); linked_ptr<DictionaryValue> sync_data = @@ -210,7 +210,7 @@ csync::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); - csync::SyncError error; + syncer::SyncError error; if (maybe_sync_data != grouped_sync_data.end()) { error = it->second->StartSyncing( *maybe_sync_data->second, @@ -234,18 +234,18 @@ csync::SyncError SettingsBackend::MergeDataAndStartSyncing( GetOrCreateStorageWithSyncData(it->first, *it->second); } - return csync::SyncError(); + return syncer::SyncError(); } -csync::SyncError SettingsBackend::ProcessSyncChanges( +syncer::SyncError SettingsBackend::ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& sync_changes) { + const syncer::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 (csync::SyncChangeList::const_iterator it = sync_changes.begin(); + for (syncer::SyncChangeList::const_iterator it = sync_changes.begin(); it != sync_changes.end(); ++it) { SettingSyncData data(*it); grouped_sync_data[data.extension_id()].push_back(data); @@ -257,12 +257,12 @@ csync::SyncError SettingsBackend::ProcessSyncChanges( it = grouped_sync_data.begin(); it != grouped_sync_data.end(); ++it) { SyncableSettingsStorage* storage = GetOrCreateStorageWithSyncData(it->first, empty); - csync::SyncError error = storage->ProcessSyncChanges(it->second); + syncer::SyncError error = storage->ProcessSyncChanges(it->second); if (error.IsSet()) storage->StopSyncing(); } - return csync::SyncError(); + return syncer::SyncError(); } void SettingsBackend::StopSyncing(syncable::ModelType type) { diff --git a/chrome/browser/extensions/settings/settings_backend.h b/chrome/browser/extensions/settings/settings_backend.h index 6baa100..3e9d833 100644 --- a/chrome/browser/extensions/settings/settings_backend.h +++ b/chrome/browser/extensions/settings/settings_backend.h @@ -18,7 +18,7 @@ #include "chrome/browser/value_store/leveldb_value_store.h" #include "sync/api/syncable_service.h" -namespace csync { +namespace syncer { class SyncErrorFactory; } @@ -27,7 +27,7 @@ namespace extensions { // Manages ValueStore objects for extensions, including routing // changes from sync to them. // Lives entirely on the FILE thread. -class SettingsBackend : public csync::SyncableService { +class SettingsBackend : public syncer::SyncableService { public: // |storage_factory| is use to create leveldb storage areas. // |base_path| is the base of the extension settings directory, so the @@ -48,17 +48,17 @@ class SettingsBackend : public csync::SyncableService { // Deletes all setting data for an extension. Call on the FILE thread. void DeleteStorage(const std::string& extension_id); - // csync::SyncableService implementation. - virtual csync::SyncDataList GetAllSyncData( + // syncer::SyncableService implementation. + virtual syncer::SyncDataList GetAllSyncData( syncable::ModelType type) const OVERRIDE; - virtual csync::SyncError MergeDataAndStartSyncing( + virtual syncer::SyncError MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) OVERRIDE; - virtual csync::SyncError ProcessSyncChanges( + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE; + const syncer::SyncChangeList& change_list) OVERRIDE; virtual void StopSyncing(syncable::ModelType type) OVERRIDE; private: @@ -99,10 +99,10 @@ class SettingsBackend : public csync::SyncableService { syncable::ModelType sync_type_; // Current sync processor, if any. - scoped_ptr<csync::SyncChangeProcessor> sync_processor_; + scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; // Current sync error handler if any. - scoped_ptr<csync::SyncErrorFactory> sync_error_factory_; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_; DISALLOW_COPY_AND_ASSIGN(SettingsBackend); }; diff --git a/chrome/browser/extensions/settings/settings_frontend.cc b/chrome/browser/extensions/settings/settings_frontend.cc index a56ec57..b3fd10a 100644 --- a/chrome/browser/extensions/settings/settings_frontend.cc +++ b/chrome/browser/extensions/settings/settings_frontend.cc @@ -263,7 +263,7 @@ SettingsFrontend::~SettingsFrontend() { observers_->RemoveObserver(profile_observer_.get()); } -csync::SyncableService* SettingsFrontend::GetBackendForSync( +syncer::SyncableService* SettingsFrontend::GetBackendForSync( syncable::ModelType type) const { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); std::map<settings_namespace::Namespace, BackendWrappers>::const_iterator diff --git a/chrome/browser/extensions/settings/settings_frontend.h b/chrome/browser/extensions/settings/settings_frontend.h index ac4ea15..8dc4c26 100644 --- a/chrome/browser/extensions/settings/settings_frontend.h +++ b/chrome/browser/extensions/settings/settings_frontend.h @@ -43,12 +43,13 @@ class SettingsFrontend { virtual ~SettingsFrontend(); - typedef base::Callback<void(csync::SyncableService*)> SyncableServiceCallback; + typedef base::Callback<void(syncer::SyncableService*)> + SyncableServiceCallback; typedef base::Callback<void(ValueStore*)> StorageCallback; // Must only be called from the FILE thread. |type| should be either // APP_SETTINGS or EXTENSION_SETTINGS. - csync::SyncableService* GetBackendForSync(syncable::ModelType type) const; + syncer::SyncableService* GetBackendForSync(syncable::ModelType type) const; // Runs |callback| on the FILE thread with the storage area for // |extension_id|. If there is no extension with that ID, the storage area diff --git a/chrome/browser/extensions/settings/settings_sync_processor.cc b/chrome/browser/extensions/settings/settings_sync_processor.cc index 6ea00d0..a4707ef 100644 --- a/chrome/browser/extensions/settings/settings_sync_processor.cc +++ b/chrome/browser/extensions/settings/settings_sync_processor.cc @@ -17,7 +17,7 @@ namespace extensions { SettingsSyncProcessor::SettingsSyncProcessor( const std::string& extension_id, syncable::ModelType type, - csync::SyncChangeProcessor* sync_processor) + syncer::SyncChangeProcessor* sync_processor) : extension_id_(extension_id), type_(type), sync_processor_(sync_processor), @@ -42,12 +42,12 @@ void SettingsSyncProcessor::Init(const DictionaryValue& initial_state) { initialized_ = true; } -csync::SyncError SettingsSyncProcessor::SendChanges( +syncer::SyncError SettingsSyncProcessor::SendChanges( const ValueStoreChangeList& changes) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); CHECK(initialized_) << "Init not called"; - csync::SyncChangeList sync_changes; + syncer::SyncChangeList sync_changes; std::set<std::string> added_keys; std::set<std::string> deleted_keys; @@ -79,9 +79,9 @@ csync::SyncError SettingsSyncProcessor::SendChanges( } if (sync_changes.empty()) - return csync::SyncError(); + return syncer::SyncError(); - csync::SyncError error = + syncer::SyncError error = sync_processor_->ProcessSyncChanges(FROM_HERE, sync_changes); if (error.IsSet()) return error; @@ -92,7 +92,7 @@ csync::SyncError SettingsSyncProcessor::SendChanges( synced_keys_.erase(*i); } - return csync::SyncError(); + return syncer::SyncError(); } void SettingsSyncProcessor::NotifyChanges(const ValueStoreChangeList& changes) { diff --git a/chrome/browser/extensions/settings/settings_sync_processor.h b/chrome/browser/extensions/settings/settings_sync_processor.h index 8567006..42c5d6b 100644 --- a/chrome/browser/extensions/settings/settings_sync_processor.h +++ b/chrome/browser/extensions/settings/settings_sync_processor.h @@ -12,9 +12,9 @@ #include "chrome/browser/value_store/value_store_change.h" #include "sync/api/sync_error.h" -namespace csync { +namespace syncer { class SyncChangeProcessor; -} // namespace csync +} // namespace syncer namespace extensions { @@ -28,14 +28,14 @@ class SettingsSyncProcessor { public: SettingsSyncProcessor(const std::string& extension_id, syncable::ModelType type, - csync::SyncChangeProcessor* sync_processor); + syncer::SyncChangeProcessor* sync_processor); ~SettingsSyncProcessor(); // Initializes this with the initial state of sync. void Init(const DictionaryValue& initial_state); // Sends |changes| to sync. - csync::SyncError SendChanges(const ValueStoreChangeList& changes); + syncer::SyncError SendChanges(const ValueStoreChangeList& changes); // Informs this that |changes| have been receieved from sync. No action will // be taken, but this must be notified for internal bookkeeping. @@ -51,7 +51,7 @@ class SettingsSyncProcessor { const syncable::ModelType type_; // The sync processor used to send changes to sync. - csync::SyncChangeProcessor* const sync_processor_; + syncer::SyncChangeProcessor* const sync_processor_; // Whether Init() has been called. bool initialized_; diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc index a6bd714..483ffe8 100644 --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc @@ -82,25 +82,25 @@ testing::AssertionResult SettingsEq( // SyncChangeProcessor which just records the changes made, accessed after // being converted to the more useful SettingSyncData via changes(). -class MockSyncChangeProcessor : public csync::SyncChangeProcessor { +class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { public: MockSyncChangeProcessor() : fail_all_requests_(false) {} - // csync::SyncChangeProcessor implementation. - virtual csync::SyncError ProcessSyncChanges( + // syncer::SyncChangeProcessor implementation. + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) OVERRIDE { if (fail_all_requests_) { - return csync::SyncError( + return syncer::SyncError( FROM_HERE, "MockSyncChangeProcessor: configured to fail", change_list[0].sync_data().GetDataType()); } - for (csync::SyncChangeList::const_iterator it = change_list.begin(); + for (syncer::SyncChangeList::const_iterator it = change_list.begin(); it != change_list.end(); ++it) { changes_.push_back(SettingSyncData(*it)); } - return csync::SyncError(); + return syncer::SyncError(); } // Mock methods. @@ -130,7 +130,7 @@ class MockSyncChangeProcessor : public csync::SyncChangeProcessor { ADD_FAILURE() << "No matching changes for " << extension_id << "/" << key << " (out of " << changes_.size() << ")"; return SettingSyncData( - csync::SyncChange::ACTION_INVALID, "", "", + syncer::SyncChange::ACTION_INVALID, "", "", scoped_ptr<Value>(new DictionaryValue())); } if (matching_changes.size() != 1u) { @@ -145,24 +145,24 @@ class MockSyncChangeProcessor : public csync::SyncChangeProcessor { bool fail_all_requests_; }; -class SyncChangeProcessorDelegate : public csync::SyncChangeProcessor { +class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor { public: - explicit SyncChangeProcessorDelegate(csync::SyncChangeProcessor* recipient) + explicit SyncChangeProcessorDelegate(syncer::SyncChangeProcessor* recipient) : recipient_(recipient) { DCHECK(recipient_); } virtual ~SyncChangeProcessorDelegate() {} - // csync::SyncChangeProcessor implementation. - virtual csync::SyncError ProcessSyncChanges( + // syncer::SyncChangeProcessor implementation. + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) OVERRIDE { return recipient_->ProcessSyncChanges(from_here, change_list); } private: // The recipient of all sync changes. - csync::SyncChangeProcessor* recipient_; + syncer::SyncChangeProcessor* recipient_; DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate); }; @@ -194,7 +194,7 @@ class TestingValueStoreFactory : public SettingsStorageFactory { std::map<std::string, TestingValueStore*> created_; }; -void AssignSettingsService(csync::SyncableService** dst, +void AssignSettingsService(syncer::SyncableService** dst, const SettingsFrontend* frontend, syncable::ModelType type) { *dst = frontend->GetBackendForSync(type); @@ -234,8 +234,8 @@ class ExtensionSettingsSyncTest : public testing::Test { return util::GetStorage(id, frontend_.get()); } - // Gets the csync::SyncableService for the given sync type. - csync::SyncableService* GetSyncableService(syncable::ModelType model_type) { + // Gets the syncer::SyncableService for the given sync type. + syncer::SyncableService* GetSyncableService(syncable::ModelType model_type) { MessageLoop::current()->RunAllPending(); return frontend_->GetBackendForSync(model_type); } @@ -244,10 +244,10 @@ class ExtensionSettingsSyncTest : public testing::Test { // from extension id to its sync data. std::map<std::string, SettingSyncDataList> GetAllSyncData( syncable::ModelType model_type) { - csync::SyncDataList as_list = + syncer::SyncDataList as_list = GetSyncableService(model_type)->GetAllSyncData(model_type); std::map<std::string, SettingSyncDataList> as_map; - for (csync::SyncDataList::iterator it = as_list.begin(); + for (syncer::SyncDataList::iterator it = as_list.begin(); it != as_list.end(); ++it) { SettingSyncData sync_data(*it); as_map[sync_data.extension_id()].push_back(sync_data); @@ -283,9 +283,9 @@ TEST_F(ExtensionSettingsSyncTest, NoDataDoesNotInvokeSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); AddExtensionAndGetStorage("s2", type); EXPECT_EQ(0u, GetAllSyncData(model_type).size()); @@ -318,7 +318,7 @@ TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) { EXPECT_EQ(1u, all_sync_data["s2"].size()); EXPECT_PRED_FORMAT2(ValuesEq, &value2, &all_sync_data["s2"][0].value()); - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "s1", "foo", value1, model_type)); sync_data.push_back(settings_sync_util::CreateData( @@ -326,8 +326,8 @@ TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Already in sync, so no changes. EXPECT_EQ(0u, sync_processor_->changes().size()); @@ -340,7 +340,7 @@ TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) { storage1->Set(DEFAULTS, "foo", value2); EXPECT_EQ(1u, sync_processor_->changes().size()); SettingSyncData change = sync_processor_->GetOnlyChange("s1", "foo"); - EXPECT_EQ(csync::SyncChange::ACTION_UPDATE, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type()); EXPECT_TRUE(value2.Equals(&change.value())); GetSyncableService(model_type)->StopSyncing(model_type); @@ -362,17 +362,17 @@ TEST_F(ExtensionSettingsSyncTest, LocalDataWithNoSyncDataIsPushedToSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // All settings should have been pushed to sync. EXPECT_EQ(2u, sync_processor_->changes().size()); SettingSyncData change = sync_processor_->GetOnlyChange("s1", "foo"); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type()); EXPECT_TRUE(value1.Equals(&change.value())); change = sync_processor_->GetOnlyChange("s2", "bar"); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type()); EXPECT_TRUE(value2.Equals(&change.value())); GetSyncableService(model_type)->StopSyncing(model_type); @@ -394,15 +394,15 @@ TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) { ValueStore* storage1 = AddExtensionAndGetStorage("s1", type); storage1->Set(DEFAULTS, "overwriteMe", value1); - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "s1", "foo", value1, model_type)); sync_data.push_back(settings_sync_util::CreateData( "s2", "bar", value2, model_type)); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); expected1.Set("foo", value1.DeepCopy()); expected2.Set("bar", value2.DeepCopy()); @@ -437,18 +437,18 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) { storage1->Set(DEFAULTS, "foo", value1); expected1.Set("foo", value1.DeepCopy()); - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "s2", "bar", value2, model_type)); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); expected2.Set("bar", value2.DeepCopy()); // Make sync add some settings. - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateAdd( "s1", "bar", value2, model_type)); change_list.push_back(settings_sync_util::CreateAdd( @@ -509,7 +509,7 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) { storage1->Set(DEFAULTS, "foo", value1); storage2->Set(DEFAULTS, "foo", value1); - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "s3", "bar", value2, model_type)); sync_data.push_back(settings_sync_util::CreateData( @@ -517,8 +517,8 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Add something locally. storage1->Set(DEFAULTS, "bar", value2); @@ -527,16 +527,16 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) { storage4->Set(DEFAULTS, "foo", value1); SettingSyncData change = sync_processor_->GetOnlyChange("s1", "bar"); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type()); EXPECT_TRUE(value2.Equals(&change.value())); sync_processor_->GetOnlyChange("s2", "bar"); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type()); EXPECT_TRUE(value2.Equals(&change.value())); change = sync_processor_->GetOnlyChange("s3", "foo"); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type()); EXPECT_TRUE(value1.Equals(&change.value())); change = sync_processor_->GetOnlyChange("s4", "foo"); - EXPECT_EQ(csync::SyncChange::ACTION_ADD, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change.change_type()); EXPECT_TRUE(value1.Equals(&change.value())); // Change something locally, storage1/3 the new setting and storage2/4 the @@ -549,16 +549,16 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) { storage4->Set(DEFAULTS, "foo", value2); change = sync_processor_->GetOnlyChange("s1", "bar"); - EXPECT_EQ(csync::SyncChange::ACTION_UPDATE, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type()); EXPECT_TRUE(value1.Equals(&change.value())); change = sync_processor_->GetOnlyChange("s2", "foo"); - EXPECT_EQ(csync::SyncChange::ACTION_UPDATE, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type()); EXPECT_TRUE(value2.Equals(&change.value())); change = sync_processor_->GetOnlyChange("s3", "bar"); - EXPECT_EQ(csync::SyncChange::ACTION_UPDATE, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type()); EXPECT_TRUE(value1.Equals(&change.value())); change = sync_processor_->GetOnlyChange("s4", "foo"); - EXPECT_EQ(csync::SyncChange::ACTION_UPDATE, change.change_type()); + EXPECT_EQ(syncer::SyncChange::ACTION_UPDATE, change.change_type()); EXPECT_TRUE(value2.Equals(&change.value())); // Remove something locally, storage1/3 the new setting and storage2/4 the @@ -571,16 +571,16 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) { storage4->Remove("bar"); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s1", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s2", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s3", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s4", "bar").change_type()); // Remove some nonexistent settings. @@ -606,28 +606,28 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) { storage4->Clear(); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s1", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s1", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s2", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s2", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s3", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s3", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s4", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, sync_processor_->GetOnlyChange("s4", "bar").change_type()); GetSyncableService(model_type)->StopSyncing(model_type); @@ -660,15 +660,15 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) { EXPECT_PRED_FORMAT2(ValuesEq, &value2, &app_sync_data["s2"][0].value()); // Stop each separately, there should be no changes either time. - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "s1", "foo", value1, syncable::EXTENSION_SETTINGS)); GetSyncableService(syncable::EXTENSION_SETTINGS)->MergeDataAndStartSyncing( syncable::EXTENSION_SETTINGS, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); GetSyncableService(syncable::EXTENSION_SETTINGS)-> StopSyncing(syncable::EXTENSION_SETTINGS); EXPECT_EQ(0u, sync_processor_->changes().size()); @@ -682,8 +682,8 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) { GetSyncableService(syncable::APP_SETTINGS)->MergeDataAndStartSyncing( syncable::APP_SETTINGS, sync_data, - app_settings_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + app_settings_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); GetSyncableService(syncable::APP_SETTINGS)-> StopSyncing(syncable::APP_SETTINGS); EXPECT_EQ(0u, sync_processor_->changes().size()); @@ -708,7 +708,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { // Make bad fail for incoming sync changes. testing_factory->GetExisting("bad")->SetFailAllRequests(true); { - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "good", "foo", fooValue, model_type)); sync_data.push_back(settings_sync_util::CreateData( @@ -716,8 +716,9 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>( + new syncer::SyncErrorFactoryMock())); } testing_factory->GetExisting("bad")->SetFailAllRequests(false); @@ -737,7 +738,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { bad->Set(DEFAULTS, "bar", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); @@ -756,7 +757,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { // Changes received from sync should go to good but not bad (even when it's // not failing). { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateUpdate( "good", "foo", barValue, model_type)); // (Sending UPDATE here even though it's adding, since that's what the state @@ -785,7 +786,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { bad->Set(DEFAULTS, "bar", fooValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); @@ -804,7 +805,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { // Failing ProcessSyncChanges shouldn't go to the storage. testing_factory->GetExisting("bad")->SetFailAllRequests(true); { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateUpdate( "good", "foo", fooValue, model_type)); // (Ditto.) @@ -833,20 +834,20 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { sync_processor_.get())); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Local settings will have been pushed to sync, since it's empty (in this // test; presumably it wouldn't be live, since we've been getting changes). EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "bar").change_type()); EXPECT_EQ(3u, sync_processor_->changes().size()); @@ -856,16 +857,16 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) { bad->Set(DEFAULTS, "bar", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("bad", "bar").change_type()); EXPECT_EQ(2u, sync_processor_->changes().size()); // And ProcessSyncChanges work, too. { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateUpdate( "good", "bar", fooValue, model_type)); change_list.push_back(settings_sync_util::CreateUpdate( @@ -903,7 +904,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) { // Unlike before, initially succeeding MergeDataAndStartSyncing. { - csync::SyncDataList sync_data; + syncer::SyncDataList sync_data; sync_data.push_back(settings_sync_util::CreateData( "good", "foo", fooValue, model_type)); sync_data.push_back(settings_sync_util::CreateData( @@ -911,8 +912,9 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, sync_data, - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>( + new syncer::SyncErrorFactoryMock())); } EXPECT_EQ(0u, sync_processor_->changes().size()); @@ -931,7 +933,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) { // Now fail ProcessSyncChanges for bad. testing_factory->GetExisting("bad")->SetFailAllRequests(true); { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateAdd( "good", "bar", barValue, model_type)); change_list.push_back(settings_sync_util::CreateAdd( @@ -958,13 +960,13 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) { bad->Set(DEFAULTS, "foo", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); // No more changes received from sync should go to bad. { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateAdd( "good", "foo", fooValue, model_type)); change_list.push_back(settings_sync_util::CreateAdd( @@ -1005,7 +1007,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingGetAllSyncDataDoesntStopSync) { // include that from good. testing_factory->GetExisting("bad")->SetFailAllRequests(true); { - csync::SyncDataList all_sync_data = + syncer::SyncDataList all_sync_data = GetSyncableService(model_type)->GetAllSyncData(model_type); EXPECT_EQ(1u, all_sync_data.size()); EXPECT_EQ("good/foo", all_sync_data[0].GetTag()); @@ -1015,15 +1017,15 @@ TEST_F(ExtensionSettingsSyncTest, FailingGetAllSyncDataDoesntStopSync) { // Sync shouldn't be disabled for good (nor bad -- but this is unimportant). GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "foo").change_type()); EXPECT_EQ(2u, sync_processor_->changes().size()); @@ -1032,10 +1034,10 @@ TEST_F(ExtensionSettingsSyncTest, FailingGetAllSyncDataDoesntStopSync) { bad->Set(DEFAULTS, "bar", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "bar").change_type()); EXPECT_EQ(2u, sync_processor_->changes().size()); } @@ -1061,13 +1063,13 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) { testing_factory->GetExisting("bad")->SetFailAllRequests(true); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); testing_factory->GetExisting("bad")->SetFailAllRequests(false); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); @@ -1077,12 +1079,12 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) { bad->Set(DEFAULTS, "bar", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateUpdate( "good", "foo", barValue, model_type)); // (Sending ADD here even though it's updating, since that's what the state @@ -1113,21 +1115,21 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) { sync_processor_.get())); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "bar").change_type()); EXPECT_EQ(4u, sync_processor_->changes().size()); @@ -1136,10 +1138,10 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) { bad->Set(DEFAULTS, "bar", fooValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ(2u, sync_processor_->changes().size()); } @@ -1163,9 +1165,9 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) { sync_processor_->SetFailAllRequests(true); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); sync_processor_->SetFailAllRequests(false); // Changes from good will be send to sync, changes from bad won't. @@ -1174,13 +1176,13 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) { bad->Set(DEFAULTS, "foo", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); // Changes from sync will be sent to good, not to bad. { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateAdd( "good", "bar", barValue, model_type)); change_list.push_back(settings_sync_util::CreateAdd( @@ -1207,18 +1209,18 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) { sync_processor_.get())); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "foo").change_type()); EXPECT_EQ(3u, sync_processor_->changes().size()); @@ -1227,10 +1229,10 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) { bad->Set(DEFAULTS, "foo", fooValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(2u, sync_processor_->changes().size()); } @@ -1250,9 +1252,9 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) { GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // bad will fail to send changes. good->Set(DEFAULTS, "foo", fooValue); @@ -1261,7 +1263,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) { sync_processor_->SetFailAllRequests(false); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); @@ -1271,13 +1273,13 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) { bad->Set(DEFAULTS, "foo", barValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(1u, sync_processor_->changes().size()); // Changes from sync will be sent to good, not to bad. { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateAdd( "good", "bar", barValue, model_type)); change_list.push_back(settings_sync_util::CreateAdd( @@ -1304,18 +1306,18 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) { sync_processor_.get())); GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("good", "bar").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, sync_processor_->GetOnlyChange("bad", "foo").change_type()); EXPECT_EQ(3u, sync_processor_->changes().size()); @@ -1324,10 +1326,10 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) { bad->Set(DEFAULTS, "foo", fooValue); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, sync_processor_->GetOnlyChange("good", "foo").change_type()); EXPECT_EQ(2u, sync_processor_->changes().size()); } @@ -1346,9 +1348,9 @@ TEST_F(ExtensionSettingsSyncTest, GetSyncableService(model_type)->MergeDataAndStartSyncing( model_type, - csync::SyncDataList(), - sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>(), - scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock())); + syncer::SyncDataList(), + sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(), + scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); // Large local change rejected and doesn't get sent out. ValueStore* storage1 = AddExtensionAndGetStorage("s1", type); @@ -1358,7 +1360,7 @@ TEST_F(ExtensionSettingsSyncTest, // Large incoming change should still get accepted. ValueStore* storage2 = AddExtensionAndGetStorage("s2", type); { - csync::SyncChangeList change_list; + syncer::SyncChangeList change_list; change_list.push_back(settings_sync_util::CreateAdd( "s1", "large_value", large_value, model_type)); change_list.push_back(settings_sync_util::CreateAdd( diff --git a/chrome/browser/extensions/settings/settings_sync_util.cc b/chrome/browser/extensions/settings/settings_sync_util.cc index 53c2d24..1a6ff74 100644 --- a/chrome/browser/extensions/settings/settings_sync_util.cc +++ b/chrome/browser/extensions/settings/settings_sync_util.cc @@ -41,7 +41,7 @@ void PopulateAppSettingSpecifics( } // namespace -csync::SyncData CreateData( +syncer::SyncData CreateData( const std::string& extension_id, const std::string& key, const Value& value, @@ -68,37 +68,37 @@ csync::SyncData CreateData( NOTREACHED(); } - return csync::SyncData::CreateLocalData( + return syncer::SyncData::CreateLocalData( extension_id + "/" + key, key, specifics); } -csync::SyncChange CreateAdd( +syncer::SyncChange CreateAdd( const std::string& extension_id, const std::string& key, const Value& value, syncable::ModelType type) { - return csync::SyncChange( - csync::SyncChange::ACTION_ADD, + return syncer::SyncChange( + syncer::SyncChange::ACTION_ADD, CreateData(extension_id, key, value, type)); } -csync::SyncChange CreateUpdate( +syncer::SyncChange CreateUpdate( const std::string& extension_id, const std::string& key, const Value& value, syncable::ModelType type) { - return csync::SyncChange( - csync::SyncChange::ACTION_UPDATE, + return syncer::SyncChange( + syncer::SyncChange::ACTION_UPDATE, CreateData(extension_id, key, value, type)); } -csync::SyncChange CreateDelete( +syncer::SyncChange CreateDelete( const std::string& extension_id, const std::string& key, syncable::ModelType type) { DictionaryValue no_value; - return csync::SyncChange( - csync::SyncChange::ACTION_DELETE, + return syncer::SyncChange( + syncer::SyncChange::ACTION_DELETE, CreateData(extension_id, key, no_value, type)); } diff --git a/chrome/browser/extensions/settings/settings_sync_util.h b/chrome/browser/extensions/settings/settings_sync_util.h index 1800b8f..dede098 100644 --- a/chrome/browser/extensions/settings/settings_sync_util.h +++ b/chrome/browser/extensions/settings/settings_sync_util.h @@ -18,29 +18,29 @@ namespace extensions { namespace settings_sync_util { -// Creates a csync::SyncData object for an extension or app setting. -csync::SyncData CreateData( +// Creates a syncer::SyncData object for an extension or app setting. +syncer::SyncData CreateData( const std::string& extension_id, const std::string& key, const base::Value& value, syncable::ModelType type); // Creates an "add" sync change for an extension or app setting. -csync::SyncChange CreateAdd( +syncer::SyncChange CreateAdd( const std::string& extension_id, const std::string& key, const base::Value& value, syncable::ModelType type); // Creates an "update" sync change for an extension or app setting. -csync::SyncChange CreateUpdate( +syncer::SyncChange CreateUpdate( const std::string& extension_id, const std::string& key, const base::Value& value, syncable::ModelType type); // Creates a "delete" sync change for an extension or app setting. -csync::SyncChange CreateDelete( +syncer::SyncChange CreateDelete( const std::string& extension_id, const std::string& key, syncable::ModelType type); diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.cc b/chrome/browser/extensions/settings/syncable_settings_storage.cc index 22fd671..a111b19 100644 --- a/chrome/browser/extensions/settings/syncable_settings_storage.cc +++ b/chrome/browser/extensions/settings/syncable_settings_storage.cc @@ -121,7 +121,7 @@ ValueStore::WriteResult SyncableSettingsStorage::Clear() { void SyncableSettingsStorage::SyncResultIfEnabled( const ValueStore::WriteResult& result) { if (sync_processor_.get() && !result->changes().empty()) { - csync::SyncError error = sync_processor_->SendChanges(result->changes()); + syncer::SyncError error = sync_processor_->SendChanges(result->changes()); if (error.IsSet()) StopSyncing(); } @@ -129,7 +129,7 @@ void SyncableSettingsStorage::SyncResultIfEnabled( // Sync-related methods. -csync::SyncError SyncableSettingsStorage::StartSyncing( +syncer::SyncError SyncableSettingsStorage::StartSyncing( const DictionaryValue& sync_state, scoped_ptr<SettingsSyncProcessor> sync_processor) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); @@ -140,7 +140,7 @@ csync::SyncError SyncableSettingsStorage::StartSyncing( ReadResult maybe_settings = delegate_->Get(); if (maybe_settings->HasError()) { - return csync::SyncError( + return syncer::SyncError( FROM_HERE, std::string("Failed to get settings: ") + maybe_settings->error(), sync_processor_->type()); @@ -153,7 +153,7 @@ csync::SyncError SyncableSettingsStorage::StartSyncing( return OverwriteLocalSettingsWithSync(sync_state, settings); } -csync::SyncError SyncableSettingsStorage::SendLocalSettingsToSync( +syncer::SyncError SyncableSettingsStorage::SendLocalSettingsToSync( const DictionaryValue& settings) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); @@ -163,16 +163,16 @@ csync::SyncError SyncableSettingsStorage::SendLocalSettingsToSync( } if (changes.empty()) - return csync::SyncError(); + return syncer::SyncError(); - csync::SyncError error = sync_processor_->SendChanges(changes); + syncer::SyncError error = sync_processor_->SendChanges(changes); if (error.IsSet()) StopSyncing(); return error; } -csync::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync( +syncer::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync( const DictionaryValue& sync_state, const DictionaryValue& settings) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); // Treat this as a list of changes to sync and use ProcessSyncChanges. @@ -191,7 +191,7 @@ csync::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync( // Sync value is different, update local setting with new value. changes.push_back( SettingSyncData( - csync::SyncChange::ACTION_UPDATE, + syncer::SyncChange::ACTION_UPDATE, extension_id_, it.key(), sync_value.Pass())); @@ -200,7 +200,7 @@ csync::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync( // Not synced, delete local setting. changes.push_back( SettingSyncData( - csync::SyncChange::ACTION_DELETE, + syncer::SyncChange::ACTION_DELETE, extension_id_, it.key(), scoped_ptr<Value>(new DictionaryValue()))); @@ -214,14 +214,14 @@ csync::SyncError SyncableSettingsStorage::OverwriteLocalSettingsWithSync( CHECK(new_sync_state->RemoveWithoutPathExpansion(key, &value)); changes.push_back( SettingSyncData( - csync::SyncChange::ACTION_ADD, + syncer::SyncChange::ACTION_ADD, extension_id_, key, scoped_ptr<Value>(value))); } if (changes.empty()) - return csync::SyncError(); + return syncer::SyncError(); return ProcessSyncChanges(changes); } @@ -231,19 +231,19 @@ void SyncableSettingsStorage::StopSyncing() { sync_processor_.reset(); } -csync::SyncError SyncableSettingsStorage::ProcessSyncChanges( +syncer::SyncError SyncableSettingsStorage::ProcessSyncChanges( const SettingSyncDataList& sync_changes) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!sync_changes.empty()) << "No sync changes for " << extension_id_; if (!sync_processor_.get()) { - return csync::SyncError( + return syncer::SyncError( FROM_HERE, std::string("Sync is inactive for ") + extension_id_, syncable::UNSPECIFIED); } - std::vector<csync::SyncError> errors; + std::vector<syncer::SyncError> errors; ValueStoreChangeList changes; for (SettingSyncDataList::const_iterator it = sync_changes.begin(); @@ -257,7 +257,7 @@ csync::SyncError SyncableSettingsStorage::ProcessSyncChanges( { ReadResult maybe_settings = Get(it->key()); if (maybe_settings->HasError()) { - errors.push_back(csync::SyncError( + errors.push_back(syncer::SyncError( FROM_HERE, std::string("Error getting current sync state for ") + extension_id_ + "/" + key + ": " + maybe_settings->error(), @@ -270,10 +270,10 @@ csync::SyncError SyncableSettingsStorage::ProcessSyncChanges( } } - csync::SyncError error; + syncer::SyncError error; switch (it->change_type()) { - case csync::SyncChange::ACTION_ADD: + case syncer::SyncChange::ACTION_ADD: if (!current_value.get()) { error = OnSyncAdd(key, value.DeepCopy(), &changes); } else { @@ -286,7 +286,7 @@ csync::SyncError SyncableSettingsStorage::ProcessSyncChanges( } break; - case csync::SyncChange::ACTION_UPDATE: + case syncer::SyncChange::ACTION_UPDATE: if (current_value.get()) { error = OnSyncUpdate( key, current_value.release(), value.DeepCopy(), &changes); @@ -298,7 +298,7 @@ csync::SyncError SyncableSettingsStorage::ProcessSyncChanges( } break; - case csync::SyncChange::ACTION_DELETE: + case syncer::SyncChange::ACTION_DELETE: if (current_value.get()) { error = OnSyncDelete(key, current_value.release(), &changes); } else { @@ -326,27 +326,27 @@ csync::SyncError SyncableSettingsStorage::ProcessSyncChanges( ValueStoreChange::ToJson(changes)); // TODO(kalman): Something sensible with multiple errors. - return errors.empty() ? csync::SyncError() : errors[0]; + return errors.empty() ? syncer::SyncError() : errors[0]; } -csync::SyncError SyncableSettingsStorage::OnSyncAdd( +syncer::SyncError SyncableSettingsStorage::OnSyncAdd( const std::string& key, Value* new_value, ValueStoreChangeList* changes) { DCHECK(new_value); WriteResult result = delegate_->Set(IGNORE_QUOTA, key, *new_value); if (result->HasError()) { - return csync::SyncError( + return syncer::SyncError( FROM_HERE, std::string("Error pushing sync add to local settings: ") + result->error(), sync_processor_->type()); } changes->push_back(ValueStoreChange(key, NULL, new_value)); - return csync::SyncError(); + return syncer::SyncError(); } -csync::SyncError SyncableSettingsStorage::OnSyncUpdate( +syncer::SyncError SyncableSettingsStorage::OnSyncUpdate( const std::string& key, Value* old_value, Value* new_value, @@ -355,31 +355,31 @@ csync::SyncError SyncableSettingsStorage::OnSyncUpdate( DCHECK(new_value); WriteResult result = delegate_->Set(IGNORE_QUOTA, key, *new_value); if (result->HasError()) { - return csync::SyncError( + return syncer::SyncError( FROM_HERE, std::string("Error pushing sync update to local settings: ") + result->error(), sync_processor_->type()); } changes->push_back(ValueStoreChange(key, old_value, new_value)); - return csync::SyncError(); + return syncer::SyncError(); } -csync::SyncError SyncableSettingsStorage::OnSyncDelete( +syncer::SyncError SyncableSettingsStorage::OnSyncDelete( const std::string& key, Value* old_value, ValueStoreChangeList* changes) { DCHECK(old_value); WriteResult result = delegate_->Remove(key); if (result->HasError()) { - return csync::SyncError( + return syncer::SyncError( FROM_HERE, std::string("Error pushing sync remove to local settings: ") + result->error(), sync_processor_->type()); } changes->push_back(ValueStoreChange(key, old_value, NULL)); - return csync::SyncError(); + return syncer::SyncError(); } } // namespace extensions diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.h b/chrome/browser/extensions/settings/syncable_settings_storage.h index e8403bf..3cac0ab 100644 --- a/chrome/browser/extensions/settings/syncable_settings_storage.h +++ b/chrome/browser/extensions/settings/syncable_settings_storage.h @@ -53,7 +53,7 @@ class SyncableSettingsStorage : public ValueStore { // can be called. // Must only be called if sync isn't already active. - csync::SyncError StartSyncing( + syncer::SyncError StartSyncing( const DictionaryValue& sync_state, scoped_ptr<SettingsSyncProcessor> sync_processor); @@ -61,32 +61,32 @@ class SyncableSettingsStorage : public ValueStore { void StopSyncing(); // May be called at any time; changes will be ignored if sync isn't active. - csync::SyncError ProcessSyncChanges(const SettingSyncDataList& sync_changes); + syncer::SyncError ProcessSyncChanges(const SettingSyncDataList& sync_changes); private: // Sends the changes from |result| to sync if it's enabled. void SyncResultIfEnabled(const ValueStore::WriteResult& result); // Sends all local settings to sync (synced settings assumed to be empty). - csync::SyncError SendLocalSettingsToSync( + syncer::SyncError SendLocalSettingsToSync( const DictionaryValue& settings); // Overwrites local state with sync state. - csync::SyncError OverwriteLocalSettingsWithSync( + syncer::SyncError OverwriteLocalSettingsWithSync( const DictionaryValue& sync_state, const DictionaryValue& settings); // Called when an Add/Update/Remove comes from sync. Ownership of Value*s // are taken. - csync::SyncError OnSyncAdd( + syncer::SyncError OnSyncAdd( const std::string& key, Value* new_value, ValueStoreChangeList* changes); - csync::SyncError OnSyncUpdate( + syncer::SyncError OnSyncUpdate( const std::string& key, Value* old_value, Value* new_value, ValueStoreChangeList* changes); - csync::SyncError OnSyncDelete( + syncer::SyncError OnSyncDelete( const std::string& key, Value* old_value, ValueStoreChangeList* changes); diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc index 3846b2f..47f03c7 100644 --- a/chrome/browser/extensions/test_extension_service.cc +++ b/chrome/browser/extensions/test_extension_service.cc @@ -73,30 +73,30 @@ void TestExtensionService::CheckForUpdatesSoon() { ADD_FAILURE(); } -csync::SyncError TestExtensionService::MergeDataAndStartSyncing( +syncer::SyncError TestExtensionService::MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) { + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) { ADD_FAILURE(); - return csync::SyncError(); + return syncer::SyncError(); } void TestExtensionService::StopSyncing(syncable::ModelType type) { ADD_FAILURE(); } -csync::SyncDataList TestExtensionService::GetAllSyncData( +syncer::SyncDataList TestExtensionService::GetAllSyncData( syncable::ModelType type) const { ADD_FAILURE(); - return csync::SyncDataList(); + return syncer::SyncDataList(); } -csync::SyncError TestExtensionService::ProcessSyncChanges( +syncer::SyncError TestExtensionService::ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) { + const syncer::SyncChangeList& change_list) { ADD_FAILURE(); - return csync::SyncError(); + return syncer::SyncError(); } bool TestExtensionService::is_ready() { diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h index 4785b6c..72a012a 100644 --- a/chrome/browser/extensions/test_extension_service.h +++ b/chrome/browser/extensions/test_extension_service.h @@ -13,7 +13,7 @@ class CrxInstaller; -namespace csync { +namespace syncer { class SyncErrorFactory; } @@ -52,17 +52,17 @@ class TestExtensionService : public ExtensionServiceInterface { virtual void CheckAdminBlacklist() OVERRIDE; virtual void CheckForUpdatesSoon() OVERRIDE; - virtual csync::SyncError MergeDataAndStartSyncing( + virtual syncer::SyncError MergeDataAndStartSyncing( syncable::ModelType type, - const csync::SyncDataList& initial_sync_data, - scoped_ptr<csync::SyncChangeProcessor> sync_processor, - scoped_ptr<csync::SyncErrorFactory> sync_error_factory) OVERRIDE; + const syncer::SyncDataList& initial_sync_data, + scoped_ptr<syncer::SyncChangeProcessor> sync_processor, + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; virtual void StopSyncing(syncable::ModelType type) OVERRIDE; - virtual csync::SyncDataList GetAllSyncData( + virtual syncer::SyncDataList GetAllSyncData( syncable::ModelType type) const OVERRIDE; - virtual csync::SyncError ProcessSyncChanges( + virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const csync::SyncChangeList& change_list) OVERRIDE; + const syncer::SyncChangeList& change_list) OVERRIDE; virtual bool is_ready() OVERRIDE; |