| 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)));
|
|
|
|
|