| Index: chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
|
| diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
|
| index 323949a94af58d9fb92a87018fd651cc69027700..b14ba2eea5d8a4a289a1afe993d3f8949f649879 100644
|
| --- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
|
| +++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
|
| @@ -226,8 +226,14 @@ void DomDistillerViewerSourceBrowserTest::ViewSingleDistilledPage(
|
| EXPECT_EQ(expected_mime_type, contents_after_nav->GetContentsMimeType());
|
| }
|
|
|
| +#if defined(OS_LINUX)
|
| +// Flaky on Ubuntu-12.04 bots: https://crbug.com/604362
|
| +#define MAYBE_TestBadUrlErrorPage DISABLED_TestBadUrlErrorPage
|
| +#else
|
| +#define MAYBE_TestBadUrlErrorPage TestBadUrlErrorPage
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| - TestBadUrlErrorPage) {
|
| + MAYBE_TestBadUrlErrorPage) {
|
| GURL url("chrome-distiller://bad");
|
|
|
| // Navigate to a distiller URL.
|
| @@ -266,8 +272,15 @@ IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| ViewSingleDistilledPage(url, "text/css");
|
| }
|
|
|
| +
|
| +#if defined(OS_LINUX)
|
| +// Flaky on Ubuntu-12.04 bots: https://crbug.com/604362
|
| +#define MAYBE_EmptyURLShouldNotCrash DISABLED_EmptyURLShouldNotCrash
|
| +#else
|
| +#define MAYBE_EmptyURLShouldNotCrash EmptyURLShouldNotCrash
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| - EmptyURLShouldNotCrash) {
|
| + MAYBE_EmptyURLShouldNotCrash) {
|
| // This is a bogus URL, so no distillation will happen.
|
| expect_distillation_ = false;
|
| expect_distiller_page_ = false;
|
| @@ -502,10 +515,18 @@ IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, PrefChange) {
|
| PrefTest(false);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, PrefChangeError) {
|
| +#if defined(OS_LINUX)
|
| +// Flaky on Ubuntu-12.04 bots: https://crbug.com/604362
|
| +#define MAYBE_PrefChangeError DISABLED_PrefChangeError
|
| +#else
|
| +#define MAYBE_PrefChangeError PrefChangeError
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| + MAYBE_PrefChangeError) {
|
| PrefTest(true);
|
| }
|
|
|
| +
|
| void DomDistillerViewerSourceBrowserTest::PrefTest(bool is_error_page) {
|
| GURL url;
|
| if (is_error_page) {
|
|
|