diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:59:01 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:59:01 +0000 |
| commit | 20960e074cf789825155f771e1c035df41cd0e75 (patch) | |
| tree | 560b967c07210bda790dbeebf6174e3e971b5eb7 /chrome/browser/prefs/pref_notifier_impl_unittest.cc | |
| parent | c4f7571e88637185eb79e598bd3b6301490a2255 (diff) | |
| download | chromium_src-20960e074cf789825155f771e1c035df41cd0e75.zip chromium_src-20960e074cf789825155f771e1c035df41cd0e75.tar.gz chromium_src-20960e074cf789825155f771e1c035df41cd0e75.tar.bz2 | |
Add a gyp flag to enable dcheck by default in release without
having the pass a flag. This will be used on the try bots.
BUG=96753
Review URL: http://codereview.chromium.org/7719007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_notifier_impl_unittest.cc')
| -rw-r--r-- | chrome/browser/prefs/pref_notifier_impl_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/pref_notifier_impl_unittest.cc b/chrome/browser/prefs/pref_notifier_impl_unittest.cc index b2387ab..1beb430c 100644 --- a/chrome/browser/prefs/pref_notifier_impl_unittest.cc +++ b/chrome/browser/prefs/pref_notifier_impl_unittest.cc @@ -104,13 +104,13 @@ TEST_F(PrefNotifierTest, AddAndRemovePrefObservers) { // Re-adding the same observer for the same pref doesn't change anything. // Skip this in debug mode, since it hits a DCHECK and death tests aren't // thread-safe. -#if defined(NDEBUG) +#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) notifier.AddPrefObserver(pref_name, &obs1_); ASSERT_EQ(1u, notifier.CountObserver(pref_name, &obs1_)); ASSERT_EQ(0u, notifier.CountObserver(pref_name2, &obs1_)); ASSERT_EQ(0u, notifier.CountObserver(pref_name, &obs2_)); ASSERT_EQ(0u, notifier.CountObserver(pref_name2, &obs2_)); -#endif // NDEBUG +#endif // Ensure that we can add the same observer to a different pref. notifier.AddPrefObserver(pref_name2, &obs1_); |