Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6177)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/app_notification_manager_sync_unittest.cc

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/app_notification_manager.cc ('k') | chrome/browser/extensions/app_sync_bundle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/app_notification_manager_sync_unittest.cc
diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc
index db491067a98bbe79cb934da1cf44c34429c34e85..fc346d7689d3408b0bb0b4be0b389b87ffc80251 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 SyncData.
-std::string GetGuid(const SyncData& sync_data) {
+// Extract notification guid from csync::SyncData.
+std::string GetGuid(const csync::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 SyncChangeProcessor {
+class TestChangeProcessor : public csync::SyncChangeProcessor {
public:
TestChangeProcessor() { }
virtual ~TestChangeProcessor() { }
// Store a copy of all the changes passed in so we can examine them later.
- virtual SyncError ProcessSyncChanges(
+ virtual csync::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
- const SyncChangeList& change_list) {
+ const csync::SyncChangeList& change_list) {
// change_map_.erase(change_map_.begin(), change_map_.end());
- for (SyncChangeList::const_iterator iter = change_list.begin();
+ for (csync::SyncChangeList::const_iterator iter = change_list.begin();
iter != change_list.end(); ++iter) {
change_map_[GetGuid(iter->sync_data())] = *iter;
}
- return SyncError();
+ return csync::SyncError();
}
bool ContainsGuid(const std::string& guid) {
return change_map_.find(guid) != change_map_.end();
}
- SyncChange GetChangeByGuid(const std::string& guid) {
+ csync::SyncChange GetChangeByGuid(const std::string& guid) {
DCHECK(ContainsGuid(guid));
return change_map_[guid];
}
@@ -60,29 +60,29 @@ class TestChangeProcessor : public SyncChangeProcessor {
private:
// Track the changes received in ProcessSyncChanges.
- std::map<std::string, SyncChange> change_map_;
+ std::map<std::string, csync::SyncChange> change_map_;
DISALLOW_COPY_AND_ASSIGN(TestChangeProcessor);
};
-class SyncChangeProcessorDelegate : public SyncChangeProcessor {
+class SyncChangeProcessorDelegate : public csync::SyncChangeProcessor {
public:
- explicit SyncChangeProcessorDelegate(SyncChangeProcessor* recipient)
+ explicit SyncChangeProcessorDelegate(csync::SyncChangeProcessor* recipient)
: recipient_(recipient) {
DCHECK(recipient_);
}
virtual ~SyncChangeProcessorDelegate() {}
- // SyncChangeProcessor implementation.
- virtual SyncError ProcessSyncChanges(
+ // csync::SyncChangeProcessor implementation.
+ virtual csync::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
- const SyncChangeList& change_list) OVERRIDE {
+ const csync::SyncChangeList& change_list) OVERRIDE {
return recipient_->ProcessSyncChanges(from_here, change_list);
}
private:
// The recipient of all sync changes.
- SyncChangeProcessor* recipient_;
+ csync::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<SyncChangeProcessor> PassProcessor() {
- return sync_processor_delegate_.PassAs<SyncChangeProcessor>();
+ scoped_ptr<csync::SyncChangeProcessor> PassProcessor() {
+ return sync_processor_delegate_.PassAs<csync::SyncChangeProcessor>();
}
// Creates a notification whose properties are set from the given integer.
@@ -188,27 +188,29 @@ class AppNotificationManagerSyncTest : public testing::Test {
return notif;
}
- static SyncData CreateSyncData(int suffix) {
+ static csync::SyncData CreateSyncData(int suffix) {
scoped_ptr<AppNotification> notif(CreateNotification(suffix));
return AppNotificationManager::CreateSyncDataFromNotification(*notif);
}
- static SyncData CreateSyncData(int suffix, const std::string& extension_id) {
+ static csync::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 SyncChange. Takes ownership of |notif|.
- static SyncChange CreateSyncChange(SyncChange::SyncChangeType type,
- AppNotification* notif) {
+ // Helper to create csync::SyncChange. Takes ownership of |notif|.
+ static csync::SyncChange CreateSyncChange(
+ csync::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 SyncChange(
+ return csync::SyncChange(
type, AppNotificationManager::CreateSyncDataFromNotification(*notif));
}
- void AssertSyncChange(const SyncChange& change,
- SyncChange::SyncChangeType type,
+ void AssertSyncChange(const csync::SyncChange& change,
+ csync::SyncChange::SyncChangeType type,
const AppNotification& notif) {
ASSERT_EQ(type, change.change_type());
scoped_ptr<AppNotification> notif2(
@@ -233,11 +235,11 @@ class AppNotificationManagerSyncTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(AppNotificationManagerSyncTest);
};
-// Create an AppNotification, convert it to SyncData and convert it back.
+// Create an AppNotification, convert it to csync::SyncData and convert it back.
TEST_F(AppNotificationManagerSyncTest, NotificationToSyncDataToNotification) {
{ // Partial properties set.
scoped_ptr<AppNotification> notif1(CreateNotificationNoLink(1));
- SyncData sync_data =
+ csync::SyncData sync_data =
AppNotificationManager::CreateSyncDataFromNotification(*notif1);
scoped_ptr<AppNotification> notif2(
AppNotificationManager::CreateNotificationFromSyncData(sync_data));
@@ -246,7 +248,7 @@ TEST_F(AppNotificationManagerSyncTest, NotificationToSyncDataToNotification) {
}
{ // All properties set.
scoped_ptr<AppNotification> notif1(CreateNotification(1));
- SyncData sync_data =
+ csync::SyncData sync_data =
AppNotificationManager::CreateSyncDataFromNotification(*notif1);
scoped_ptr<AppNotification> notif2(
AppNotificationManager::CreateNotificationFromSyncData(sync_data));
@@ -260,12 +262,12 @@ TEST_F(AppNotificationManagerSyncTest, GetAllSyncDataNoLocal) {
model()->Add(CreateNotificationNoLink(1));
model()->Add(CreateNotification(2));
model()->Add(CreateNotification(3));
- SyncDataList all_sync_data =
+ csync::SyncDataList all_sync_data =
model()->GetAllSyncData(syncable::APP_NOTIFICATIONS);
EXPECT_EQ(3U, all_sync_data.size());
- for (SyncDataList::const_iterator iter = all_sync_data.begin();
+ for (csync::SyncDataList::const_iterator iter = all_sync_data.begin();
iter != all_sync_data.end(); ++iter) {
scoped_ptr<AppNotification> notif1(
AppNotificationManager::CreateNotificationFromSyncData(*iter));
@@ -285,12 +287,12 @@ TEST_F(AppNotificationManagerSyncTest, GetAllSyncDataSomeLocal) {
model()->Add(CreateNotification(3));
model()->Add(CreateNotification(true, 4));
model()->Add(CreateNotification(5));
- SyncDataList all_sync_data =
+ csync::SyncDataList all_sync_data =
model()->GetAllSyncData(syncable::APP_NOTIFICATIONS);
EXPECT_EQ(3U, all_sync_data.size());
- for (SyncDataList::const_iterator iter = all_sync_data.begin();
+ for (csync::SyncDataList::const_iterator iter = all_sync_data.begin();
iter != all_sync_data.end(); ++iter) {
scoped_ptr<AppNotification> notif1(
AppNotificationManager::CreateNotificationFromSyncData(*iter));
@@ -306,9 +308,9 @@ TEST_F(AppNotificationManagerSyncTest, GetAllSyncDataSomeLocal) {
TEST_F(AppNotificationManagerSyncTest, ModelAssocBothEmpty) {
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(), // Empty.
+ csync::SyncDataList(), // Empty.
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
EXPECT_EQ(0U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
EXPECT_EQ(0U, processor()->change_list_size());
@@ -316,7 +318,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothEmpty) {
// Model assocation: empty sync model and non-empty local model.
TEST_F(AppNotificationManagerSyncTest, ModelAssocModelEmpty) {
- SyncDataList initial_data;
+ csync::SyncDataList initial_data;
initial_data.push_back(CreateSyncData(1));
initial_data.push_back(CreateSyncData(2));
initial_data.push_back(CreateSyncData(3));
@@ -326,11 +328,11 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocModelEmpty) {
syncable::APP_NOTIFICATIONS,
initial_data,
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
EXPECT_EQ(4U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
// Model should all of the initial sync data.
- for (SyncDataList::const_iterator iter = initial_data.begin();
+ for (csync::SyncDataList::const_iterator iter = initial_data.begin();
iter != initial_data.end(); ++iter) {
scoped_ptr<AppNotification> notif1(
AppNotificationManager::CreateNotificationFromSyncData(*iter));
@@ -354,7 +356,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyNoOverlap) {
AppNotification* n3 = CreateNotification(3);
model()->Add(n3);
- SyncDataList initial_data;
+ csync::SyncDataList initial_data;
initial_data.push_back(CreateSyncData(4));
initial_data.push_back(CreateSyncData(5));
initial_data.push_back(CreateSyncData(6));
@@ -364,10 +366,10 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyNoOverlap) {
syncable::APP_NOTIFICATIONS,
initial_data,
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
EXPECT_EQ(6U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
- for (SyncDataList::const_iterator iter = initial_data.begin();
+ for (csync::SyncDataList::const_iterator iter = initial_data.begin();
iter != initial_data.end(); ++iter) {
scoped_ptr<AppNotification> notif1(
AppNotificationManager::CreateNotificationFromSyncData(*iter));
@@ -383,11 +385,11 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyNoOverlap) {
EXPECT_EQ(2U, processor()->change_list_size());
EXPECT_TRUE(processor()->ContainsGuid(n1->guid()));
- EXPECT_EQ(SyncChange::ACTION_ADD,
+ EXPECT_EQ(csync::SyncChange::ACTION_ADD,
processor()->GetChangeByGuid(n1->guid()).change_type());
EXPECT_FALSE(processor()->ContainsGuid(n2->guid()));
EXPECT_TRUE(processor()->ContainsGuid(n3->guid()));
- EXPECT_EQ(SyncChange::ACTION_ADD,
+ EXPECT_EQ(csync::SyncChange::ACTION_ADD,
processor()->GetChangeByGuid(n3->guid()).change_type());
}
@@ -403,7 +405,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptySomeOverlap) {
AppNotification* n4 = CreateNotification(4);
model()->Add(n4);
- SyncDataList initial_data;
+ csync::SyncDataList initial_data;
initial_data.push_back(CreateSyncData(5));
initial_data.push_back(
AppNotificationManager::CreateSyncDataFromNotification(*n1));
@@ -416,10 +418,10 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptySomeOverlap) {
syncable::APP_NOTIFICATIONS,
initial_data,
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
EXPECT_EQ(6U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
- for (SyncDataList::const_iterator iter = initial_data.begin();
+ for (csync::SyncDataList::const_iterator iter = initial_data.begin();
iter != initial_data.end(); ++iter) {
scoped_ptr<AppNotification> notif1(
AppNotificationManager::CreateNotificationFromSyncData(*iter));
@@ -438,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(SyncChange::ACTION_ADD,
+ EXPECT_EQ(csync::SyncChange::ACTION_ADD,
processor()->GetChangeByGuid(n3->guid()).change_type());
EXPECT_FALSE(processor()->ContainsGuid(n4->guid()));
}
@@ -451,7 +453,7 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyTitleMismatch) {
AppNotification* n2 = CreateNotification(true, 2);
model()->Add(n2);
- SyncDataList initial_data;
+ csync::SyncDataList initial_data;
initial_data.push_back(CreateSyncData(1));
scoped_ptr<AppNotification> n1_a(CreateNotification(
n1->is_local(), n1->creation_time().ToInternalValue(),
@@ -461,16 +463,19 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyTitleMismatch) {
initial_data.push_back(
AppNotificationManager::CreateSyncDataFromNotification(*n1_a));
- scoped_ptr<SyncErrorFactoryMock> error_handler(new SyncErrorFactoryMock());
+ scoped_ptr<csync::SyncErrorFactoryMock> error_handler(
+ new csync::SyncErrorFactoryMock());
EXPECT_CALL(*error_handler, CreateAndUploadError(_, _)).
WillOnce(
- Return(SyncError(FROM_HERE, "error", syncable::APP_NOTIFICATIONS)));
+ Return(
+ csync::SyncError(
+ FROM_HERE, "error", syncable::APP_NOTIFICATIONS)));
- SyncError sync_error = model()->MergeDataAndStartSyncing(
+ csync::SyncError sync_error = model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
initial_data,
PassProcessor(),
- error_handler.PassAs<SyncErrorFactory>());
+ error_handler.PassAs<csync::SyncErrorFactory>());
EXPECT_TRUE(sync_error.IsSet());
EXPECT_EQ(syncable::APP_NOTIFICATIONS, sync_error.type());
@@ -485,22 +490,25 @@ TEST_F(AppNotificationManagerSyncTest, ModelAssocBothNonEmptyMatchesLocal) {
AppNotification* n2 = CreateNotification(true, 2);
model()->Add(n2);
- SyncDataList initial_data;
+ csync::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<SyncErrorFactoryMock> error_handler(new SyncErrorFactoryMock());
+ scoped_ptr<csync::SyncErrorFactoryMock> error_handler(
+ new csync::SyncErrorFactoryMock());
EXPECT_CALL(*error_handler, CreateAndUploadError(_, _)).
WillOnce(
- Return(SyncError(FROM_HERE, "error", syncable::APP_NOTIFICATIONS)));
+ Return(
+ csync::SyncError(
+ FROM_HERE, "error", syncable::APP_NOTIFICATIONS)));
- SyncError sync_error = model()->MergeDataAndStartSyncing(
+ csync::SyncError sync_error = model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
initial_data,
PassProcessor(),
- error_handler.PassAs<SyncErrorFactory>());
+ error_handler.PassAs<csync::SyncErrorFactory>());
EXPECT_TRUE(sync_error.IsSet());
EXPECT_EQ(syncable::APP_NOTIFICATIONS, sync_error.type());
@@ -512,18 +520,18 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesEmptyModel) {
// We initially have no data.
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
// Set up a bunch of ADDs.
- SyncChangeList changes;
+ csync::SyncChangeList changes;
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(1)));
+ csync::SyncChange::ACTION_ADD, CreateNotification(1)));
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(2)));
+ csync::SyncChange::ACTION_ADD, CreateNotification(2)));
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(3)));
+ csync::SyncChange::ACTION_ADD, CreateNotification(3)));
model()->ProcessSyncChanges(FROM_HERE, changes);
@@ -539,17 +547,18 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesNonEmptyModel) {
model()->Add(n2);
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
// Some adds and some deletes.
- SyncChangeList changes;
+ csync::SyncChangeList changes;
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(3)));
- changes.push_back(CreateSyncChange(SyncChange::ACTION_DELETE, n1->Copy()));
+ csync::SyncChange::ACTION_ADD, CreateNotification(3)));
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(4)));
+ csync::SyncChange::ACTION_DELETE, n1->Copy()));
+ changes.push_back(CreateSyncChange(
+ csync::SyncChange::ACTION_ADD, CreateNotification(4)));
model()->ProcessSyncChanges(FROM_HERE, changes);
@@ -565,16 +574,16 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesIgnoreBadAdd) {
model()->Add(n2);
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
// Some adds and some deletes.
- SyncChangeList changes;
+ csync::SyncChangeList changes;
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(1)));
+ csync::SyncChange::ACTION_ADD, CreateNotification(1)));
- SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes);
+ csync::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes);
EXPECT_FALSE(error.IsSet());
EXPECT_EQ(2U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
@@ -589,16 +598,16 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesIgnoreBadDelete) {
model()->Add(n2);
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
// Some adds and some deletes.
- SyncChangeList changes;
+ csync::SyncChangeList changes;
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_DELETE, CreateNotification(3)));
+ csync::SyncChange::ACTION_DELETE, CreateNotification(3)));
- SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes);
+ csync::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes);
EXPECT_FALSE(error.IsSet());
EXPECT_EQ(2U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
@@ -613,20 +622,20 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesIgnoreBadUpdates) {
model()->Add(n2);
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
// Some adds and some deletes.
- SyncChangeList changes;
+ csync::SyncChangeList changes;
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_UPDATE, CreateNotification(3)));
+ csync::SyncChange::ACTION_UPDATE, CreateNotification(3)));
AppNotification* n2_changed = n2->Copy();
n2_changed->set_link_text(n2_changed->link_text() + "-changed");
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_UPDATE, n2_changed));
+ csync::SyncChange::ACTION_UPDATE, n2_changed));
- SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes);
+ csync::SyncError error = model()->ProcessSyncChanges(FROM_HERE, changes);
EXPECT_FALSE(error.IsSet());
EXPECT_EQ(2U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
@@ -638,14 +647,14 @@ TEST_F(AppNotificationManagerSyncTest, ProcessSyncChangesEmptyModelWithMax) {
const std::string& ext_id = "e1";
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
for (unsigned int i = 0;
i < AppNotificationManager::kMaxNotificationPerApp * 2; i++) {
- SyncChangeList changes;
+ csync::SyncChangeList changes;
changes.push_back(CreateSyncChange(
- SyncChange::ACTION_ADD, CreateNotification(false, i, ext_id)));
+ csync::SyncChange::ACTION_ADD, CreateNotification(false, i, ext_id)));
model()->ProcessSyncChanges(FROM_HERE, changes);
if (i < AppNotificationManager::kMaxNotificationPerApp) {
EXPECT_EQ(i + 1,
@@ -669,9 +678,9 @@ TEST_F(AppNotificationManagerSyncTest, StopSyncing) {
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
EXPECT_TRUE(model()->sync_processor_.get());
EXPECT_TRUE(model()->models_associated_);
@@ -685,9 +694,9 @@ TEST_F(AppNotificationManagerSyncTest, StopSyncing) {
TEST_F(AppNotificationManagerSyncTest, AddsGetsSynced) {
model()->MergeDataAndStartSyncing(
syncable::APP_NOTIFICATIONS,
- SyncDataList(),
+ csync::SyncDataList(),
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
AppNotification* n1 = CreateNotification(1);
model()->Add(n1);
@@ -698,10 +707,10 @@ TEST_F(AppNotificationManagerSyncTest, AddsGetsSynced) {
EXPECT_EQ(2U, processor()->change_list_size());
EXPECT_TRUE(processor()->ContainsGuid(n1->guid()));
- SyncChange c1 = processor()->GetChangeByGuid(n1->guid());
- AssertSyncChange(c1, SyncChange::ACTION_ADD, *n1);
- SyncChange c2 = processor()->GetChangeByGuid(n2->guid());
- AssertSyncChange(c2, SyncChange::ACTION_ADD, *n2);
+ 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);
}
// Clear all gets pushed to sync.
@@ -712,7 +721,7 @@ TEST_F(AppNotificationManagerSyncTest, ClearAllGetsSynced) {
scoped_ptr<AppNotification> n3(CreateNotification(false, 3, ext_id));
scoped_ptr<AppNotification> n4(CreateNotification(4));
- SyncDataList initial_data;
+ csync::SyncDataList initial_data;
initial_data.push_back(
AppNotificationManager::CreateSyncDataFromNotification(*n1));
initial_data.push_back(
@@ -725,16 +734,16 @@ TEST_F(AppNotificationManagerSyncTest, ClearAllGetsSynced) {
syncable::APP_NOTIFICATIONS,
initial_data,
PassProcessor(),
- scoped_ptr<SyncErrorFactory>(new SyncErrorFactoryMock()));
+ scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
model()->ClearAll(ext_id);
EXPECT_EQ(3U, processor()->change_list_size());
EXPECT_TRUE(processor()->ContainsGuid(n1->guid()));
- SyncChange c1 = processor()->GetChangeByGuid(n1->guid());
- AssertSyncChange(c1, SyncChange::ACTION_DELETE, *n1);
- SyncChange c2 = processor()->GetChangeByGuid(n2->guid());
- AssertSyncChange(c2, SyncChange::ACTION_DELETE, *n2);
- SyncChange c3 = processor()->GetChangeByGuid(n3->guid());
- AssertSyncChange(c3, SyncChange::ACTION_DELETE, *n3);
+ 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);
}
« no previous file with comments | « chrome/browser/extensions/app_notification_manager.cc ('k') | chrome/browser/extensions/app_sync_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698