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 c6556a49c488e1c3131ec3252c79d1d730d9a0e3..fed08648f592271d63876c34b1f7c326999ead8d 100644 |
--- a/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc |
+++ b/chrome/browser/sync/glue/typed_url_model_associator_unittest.cc |
@@ -384,7 +384,7 @@ class TestTypedUrlModelAssociator : public TypedUrlModelAssociator { |
public: |
TestTypedUrlModelAssociator(base::WaitableEvent* startup, |
base::WaitableEvent* aborted) |
- : TypedUrlModelAssociator(&mock_, NULL), |
+ : TypedUrlModelAssociator(&mock_, NULL, NULL), |
startup_(startup), |
aborted_(aborted) {} |
virtual bool IsAbortPending() { |
@@ -409,7 +409,8 @@ static void CreateModelAssociator(base::WaitableEvent* startup, |
// test to finish. |
*associator = new TestTypedUrlModelAssociator(startup, aborted); |
// AssociateModels should be aborted and should return false. |
- EXPECT_FALSE((*associator)->AssociateModels(NULL)); |
+ SyncError error = (*associator)->AssociateModels(); |
+ EXPECT_TRUE(error.IsSet()); |
delete *associator; |
done->Signal(); |
} |