diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 13:16:07 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 13:16:07 +0000 |
| commit | 651bf1bad6306e680cf49c2f29d8e1a2be15e35e (patch) | |
| tree | 23314c7749960d0fb2c8425b985b5ac6f256605b /chrome_frame | |
| parent | 59f6e74de99a7741d8c9e4717876067c387fe328 (diff) | |
| download | chromium_src-651bf1bad6306e680cf49c2f29d8e1a2be15e35e.zip chromium_src-651bf1bad6306e680cf49c2f29d8e1a2be15e35e.tar.gz chromium_src-651bf1bad6306e680cf49c2f29d8e1a2be15e35e.tar.bz2 | |
Clean up suppressing error dialogs for buildbots.
- also suppress dialogs caused by __debugbreak on Windows
- avoid bad interactions with gtest (they cause odd problems, really)
TEST=none
BUG=29997
Review URL: http://codereview.chromium.org/1867001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 739a6dc..37234d9 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -305,7 +305,9 @@ void CFUrlRequestUnittestRunner::Initialize() { InitializeLogging(); base::Time::UseHighResolutionTimer(true); -#if !defined(PURIFY) && defined(OS_WIN) + SuppressErrorDialogs(); + DebugUtil::SuppressDialogs(); +#if !defined(PURIFY) logging::SetLogAssertHandler(UnitTestAssertHandler); #endif // !defined(PURIFY) |