| 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 67a0372a511814c5379d5015ff3561a3f2d5c707..f67d5c641b32014abd8fea6f873d3a0fa515c2a0 100644
|
| --- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
|
| +++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
|
| @@ -169,14 +169,8 @@
|
|
|
| // The DomDistillerViewerSource renders untrusted content, so ensure no bindings
|
| // are enabled when the article exists in the database.
|
| -// Flaky on Linux Debug, see http://crbug.com/605432.
|
| -#if defined(OS_LINUX) && !defined(NDEBUG)
|
| -#define MAYBE_NoWebUIBindingsArticleExists DISABLED_NoWebUIBindingsArticleExists
|
| -#else
|
| -#define MAYBE_NoWebUIBindingsArticleExists NoWebUIBindingsArticleExists
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| - MAYBE_NoWebUIBindingsArticleExists) {
|
| +IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| + NoWebUIBindingsArticleExists) {
|
| // Ensure there is one item in the database, which will trigger distillation.
|
| const ArticleEntry entry = CreateEntry("DISTILLED", "http://example.com/1");
|
| AddEntry(entry, database_model_);
|
| @@ -189,14 +183,8 @@
|
|
|
| // The DomDistillerViewerSource renders untrusted content, so ensure no bindings
|
| // are enabled when the article is not found.
|
| -// Flaky on Linux Debug, see http://crbug.com/605432.
|
| -#if defined(OS_LINUX) && !defined(NDEBUG)
|
| -#define MAYBE_NoWebUIBindingsArticleNotFound DISABLED_NoWebUIBindingsArticleNotFound
|
| -#else
|
| -#define MAYBE_NoWebUIBindingsArticleNotFound NoWebUIBindingsArticleNotFound
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| - MAYBE_NoWebUIBindingsArticleNotFound) {
|
| +IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
|
| + NoWebUIBindingsArticleNotFound) {
|
| // The article does not exist, so assume no distillation will happen.
|
| expect_distillation_ = false;
|
| expect_distiller_page_ = false;
|
|
|