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

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator_unittest.cc

Issue 388003002: Sync: Display non-severe errors on about:sync in gray color rather than red. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed failing unit test, added extra test case, addressed CR feedback. Created 6 years, 5 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/typed_url_model_associator_unittest.cc
diff --git a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
index 815a8d062a17f76733eaf01e3b629d5356180113..731b9942b916c19f4784ee07d8f13a29db8e50c2 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc
@@ -80,8 +80,7 @@ static void CreateModelAssociatorAsync(base::WaitableEvent* startup,
aborted->Wait();
syncer::SyncError error = (*associator)->AssociateModels(NULL, NULL);
EXPECT_TRUE(error.IsSet());
- EXPECT_EQ("datatype error was encountered: Association was aborted.",
- error.message());
+ EXPECT_EQ("Association was aborted.", error.message());
delete *associator;
done->Signal();
}

Powered by Google App Engine
This is Rietveld 408576698