summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 17:24:38 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 17:24:38 +0000
commit7513961de3f2571b5e034413304a7d466cb17e6b (patch)
treef0acc7de32a8a277a252298de329864f6b3ebb66 /chrome/browser/tab_contents/render_view_host_manager_unittest.cc
parent607884fdf4e130665d08af0d9e3b989661100756 (diff)
downloadchromium_src-7513961de3f2571b5e034413304a7d466cb17e6b.zip
chromium_src-7513961de3f2571b5e034413304a7d466cb17e6b.tar.gz
chromium_src-7513961de3f2571b5e034413304a7d466cb17e6b.tar.bz2
Disables a handful of tests for chromeos as they're crashing.
BUG=29994 TEST=none TBR=albertb Review URL: http://codereview.chromium.org/486013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/render_view_host_manager_unittest.cc')
-rw-r--r--chrome/browser/tab_contents/render_view_host_manager_unittest.cc18
1 files changed, 15 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
index 1cf4e42..e61663b 100644
--- a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -12,6 +12,18 @@
#include "ipc/ipc_message.h"
#include "testing/gtest/include/gtest/gtest.h"
+// http://crbug.com/29994
+#if defined(OS_CHROMEOS)
+#define MAYBE_NewTabPageProcesses DISABLED_NewTabPageProcesses
+#define MAYBE_AlwaysSendEnableViewSourceMode \
+ DISABLED_AlwaysSendEnableViewSourceMode
+#define MAYBE_DOMUI DISABLED_DOMUI
+#else
+#define MAYBE_NewTabPageProcesses NewTabPageProcesses
+#define MAYBE_AlwaysSendEnableViewSourceMode AlwaysSendEnableViewSourceMode
+#define MAYBE_DOMUI DOMUI
+#endif
+
class RenderViewHostManagerTest : public RenderViewHostTestHarness {
public:
void NavigateActiveAndCommit(const GURL& url) {
@@ -30,7 +42,7 @@ class RenderViewHostManagerTest : public RenderViewHostTestHarness {
// then do that same thing in another tab, that the two resulting pages have
// different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is
// a regression test for bug 9364.
-TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
+TEST_F(RenderViewHostManagerTest, MAYBE_NewTabPageProcesses) {
ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
GURL ntp(chrome::kChromeUINewTabURL);
GURL dest("http://www.google.com/");
@@ -78,7 +90,7 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
// mode. See WebFrameImpl::DidFail(). We check by this test that
// EnableViewSourceMode message is sent on every navigation regardless
// RenderView is being newly created or reused.
-TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {
+TEST_F(RenderViewHostManagerTest, MAYBE_AlwaysSendEnableViewSourceMode) {
ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
const GURL kNtpUrl(chrome::kChromeUINewTabURL);
const GURL kUrl("view-source:http://foo");
@@ -229,7 +241,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
}
// Tests DOMUI creation.
-TEST_F(RenderViewHostManagerTest, DOMUI) {
+TEST_F(RenderViewHostManagerTest, MAYBE_DOMUI) {
ChromeThread ui_thread(ChromeThread::UI, MessageLoop::current());
SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());