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

Unified Diff: chrome/browser/sync/glue/bookmark_data_type_controller_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
Index: chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
index 1d97dfd76162a7dcd08a1791671a74f86df51d56..85d2510cec30df8d75787911cae2efc5f02e8f66 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
@@ -90,14 +90,14 @@ class SyncBookmarkDataTypeControllerTest : public testing::Test {
EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
EXPECT_CALL(*model_associator_, AssociateModels()).
- WillRepeatedly(Return(SyncError()));
+ WillRepeatedly(Return(csync::SyncError()));
EXPECT_CALL(service_, ActivateDataType(_, _, _));
}
void SetStopExpectations() {
EXPECT_CALL(service_, DeactivateDataType(_));
EXPECT_CALL(*model_associator_, DisassociateModels()).
- WillOnce(Return(SyncError()));
+ WillOnce(Return(csync::SyncError()));
}
void Start() {
@@ -227,7 +227,7 @@ TEST_F(SyncBookmarkDataTypeControllerTest, StartAssociationFailed) {
EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
EXPECT_CALL(*model_associator_, AssociateModels()).
- WillRepeatedly(Return(SyncError(FROM_HERE,
+ WillRepeatedly(Return(csync::SyncError(FROM_HERE,
"error",
syncable::BOOKMARKS)));

Powered by Google App Engine
This is Rietveld 408576698