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

Unified Diff: chrome/browser/sync/glue/theme_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/theme_data_type_controller_unittest.cc
diff --git a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
index 36eaa4a37efa79904b32b52ddc97c7cf9ee68f11..a6d3e8c2d39008d4e1139ad84e956abbcf7cec56 100644
--- a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
@@ -59,7 +59,7 @@ class SyncThemeDataTypeControllerTest : 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()));
}
void SetActivateExpectations() {
@@ -69,7 +69,7 @@ class SyncThemeDataTypeControllerTest : public testing::Test {
void SetStopExpectations() {
EXPECT_CALL(service_, DeactivateDataType(_));
EXPECT_CALL(*model_associator_, DisassociateModels()).
- WillOnce(Return(SyncError()));
+ WillOnce(Return(csync::SyncError()));
}
void PumpLoop() {
@@ -132,7 +132,8 @@ TEST_F(SyncThemeDataTypeControllerTest, StartAssociationFailed) {
SetStartExpectations();
SetAssociateExpectations();
EXPECT_CALL(*model_associator_, AssociateModels()).
- WillRepeatedly(Return(SyncError(FROM_HERE, "Error", syncable::THEMES)));
+ WillRepeatedly(
+ Return(csync::SyncError(FROM_HERE, "Error", syncable::THEMES)));
EXPECT_CALL(start_callback_,
Run(DataTypeController::ASSOCIATION_FAILED, _));
« no previous file with comments | « chrome/browser/sync/glue/shared_change_processor_unittest.cc ('k') | chrome/browser/sync/glue/theme_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698