diff options
| author | rustema@google.com <rustema@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 20:36:11 +0000 |
|---|---|---|
| committer | rustema@google.com <rustema@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 20:36:11 +0000 |
| commit | f05ae2ea91d3b3a2d1dc8e9dd13a35404d834d43 (patch) | |
| tree | a06a8e1eec8cfb31e82184cf7e75db3d36c7c6d4 /chrome/browser/prefs/incognito_mode_prefs_unittest.cc | |
| parent | d2e6bd6562fc25f6e01e333602c132ea14a1a17e (diff) | |
| download | chromium_src-f05ae2ea91d3b3a2d1dc8e9dd13a35404d834d43.zip chromium_src-f05ae2ea91d3b3a2d1dc8e9dd13a35404d834d43.tar.gz chromium_src-f05ae2ea91d3b3a2d1dc8e9dd13a35404d834d43.tar.bz2 | |
Disabled incognito death test on mac.
BUG=101109
TEST=chrome/browser/prefs/incognito_mode_prefs_unittest.cc
Review URL: http://codereview.chromium.org/8373019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/incognito_mode_prefs_unittest.cc')
| -rw-r--r-- | chrome/browser/prefs/incognito_mode_prefs_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc index 6ae6364..db1a3f4 100644 --- a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc +++ b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc @@ -55,7 +55,14 @@ TEST_F(IncognitoModePrefsTest, GetAvailability) { typedef IncognitoModePrefsTest IncognitoModePrefsDeathTest; -TEST_F(IncognitoModePrefsDeathTest, GetAvailabilityBadValue) { +// Takes too long to execute on Mac. http://crbug.com/101109 +#if defined(OS_MACOSX) +#define MAYBE_GetAvailabilityBadValue DISABLED_GetAvailabilityBadValue +#else +#define MAYBE_GetAvailabilityBadValue GetAvailabilityBadValue +#endif + +TEST_F(IncognitoModePrefsDeathTest, MAYBE_GetAvailabilityBadValue) { prefs_.SetUserPref(prefs::kIncognitoModeAvailability, Value::CreateIntegerValue(-1)); #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON) |