From 2a8d287cd8c5f74c596980e6e76c1d5f140012d2 Mon Sep 17 00:00:00 2001 From: "dcheng@chromium.org" Date: Tue, 14 Aug 2012 10:58:21 +0000 Subject: Fix SyncNotifierRegistrarHelper test in official builds. CHECK() messages get stripped out in official builds. BUG=none Review URL: https://chromiumcodereview.appspot.com/10826290 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151457 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/notifier/sync_notifier_registrar_unittest.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sync') diff --git a/sync/notifier/sync_notifier_registrar_unittest.cc b/sync/notifier/sync_notifier_registrar_unittest.cc index b30252b..e8c1b40 100644 --- a/sync/notifier/sync_notifier_registrar_unittest.cc +++ b/sync/notifier/sync_notifier_registrar_unittest.cc @@ -185,8 +185,9 @@ TEST_F(SyncNotifierRegistrarTest, MultipleRegistration) { registrar.UpdateRegisteredIds(&handler1, ids); registrar.DetachFromThreadForTest(); - EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, - "Duplicate registration: .*"); + // We expect a death via CHECK(). We can't match against the CHECK() message + // though since they are removed in official builds. + EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, ""); } // Make sure that passing an empty set to UpdateRegisteredIds clears the -- cgit v1.1