| Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
|
| index 53a5d9a2f07aa00910c0628aeabc4267d7a6aeff..28253c90c297592a497a8f5c9c5c8c7d23f0b082 100644
|
| --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
|
| @@ -364,7 +364,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
|
| profile_.GetBookmarkModel(),
|
| test_user_share_.user_share(),
|
| &mock_error_handler_));
|
| - SyncError error = model_associator_->AssociateModels();
|
| + csync::SyncError error = model_associator_->AssociateModels();
|
| EXPECT_FALSE(error.IsSet());
|
| MessageLoop::current()->RunAllPending();
|
|
|
| @@ -378,7 +378,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
|
| void StopSync() {
|
| change_processor_->Stop();
|
| change_processor_.reset();
|
| - SyncError error = model_associator_->DisassociateModels();
|
| + csync::SyncError error = model_associator_->DisassociateModels();
|
| EXPECT_FALSE(error.IsSet());
|
| model_associator_.reset();
|
|
|
|
|