summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 19:51:54 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-31 19:51:54 +0000
commit941a08a80d259e44e98b607df35fa36cea634163 (patch)
treef43b8d5d90283496eb74129adaf59d1f2ea0ce31
parent58cebf8f4760a748c486475f046ee201b32b0642 (diff)
downloadchromium_src-941a08a80d259e44e98b607df35fa36cea634163.zip
chromium_src-941a08a80d259e44e98b607df35fa36cea634163.tar.gz
chromium_src-941a08a80d259e44e98b607df35fa36cea634163.tar.bz2
Fix CrossSiteAfterCrash for official builds.
We need to set expected_crashes_ when breakpad is set, because it does generate a crash dump, even on Linux. Review URL: http://codereview.chromium.org/3034042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54465 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index f204e0b..c74e4c9 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -216,9 +216,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteAfterCrash) {
ASSERT_TRUE(tab.get());
// Cause the renderer to crash.
- // TODO(albertb): We need to disable this on Linux since
- // crash_service.exe hasn't been ported yet.
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(LINUX_BREAKPAD)
expected_crashes_ = 1;
#endif
ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutCrashURL)));