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

Unified Diff: chrome/browser/sync/profile_sync_service_bookmark_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/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();

Powered by Google App Engine
This is Rietveld 408576698