| Index: components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc
|
| diff --git a/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc
|
| index fb46895073e1e05fb79d7cc34fd7916e34d2ba85..8c246d08f4f95d0594c8f2c81040e1ea7999c06c 100644
|
| --- a/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc
|
| +++ b/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc
|
| @@ -182,7 +182,15 @@ class TestDistillerPageWebContents : public DistillerPageWebContents {
|
| bool new_web_contents_created_;
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, BasicDistillationWorks) {
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_BasicDistillationWorks DISABLED_BasicDistillationWorks
|
| +#else
|
| +#define MAYBE_BasicDistillationWorks BasicDistillationWorks
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| + MAYBE_BasicDistillationWorks) {
|
| DistillerPageWebContents distiller_page(
|
| shell()->web_contents()->GetBrowserContext(),
|
| shell()->web_contents()->GetContainerBounds().size(),
|
| @@ -202,7 +210,15 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, BasicDistillationWorks) {
|
| EXPECT_EQ("", distiller_result_->pagination_info().prev_page());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeLinks) {
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_HandlesRelativeLinks DISABLED_HandlesRelativeLinks
|
| +#else
|
| +#define MAYBE_HandlesRelativeLinks HandlesRelativeLinks
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| + MAYBE_HandlesRelativeLinks) {
|
| DistillerPageWebContents distiller_page(
|
| shell()->web_contents()->GetBrowserContext(),
|
| shell()->web_contents()->GetContainerBounds().size(),
|
| @@ -220,7 +236,15 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeLinks) {
|
| HasSubstr("href=\"http://www.google.com/absolutelink.html\""));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeImages) {
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_HandlesRelativeImages DISABLED_HandlesRelativeImages
|
| +#else
|
| +#define MAYBE_HandlesRelativeImages HandlesRelativeImages
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| + MAYBE_HandlesRelativeImages) {
|
| DistillerPageWebContents distiller_page(
|
| shell()->web_contents()->GetBrowserContext(),
|
| shell()->web_contents()->GetContainerBounds().size(),
|
| @@ -238,8 +262,15 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeImages) {
|
| HasSubstr("src=\"http://www.google.com/absoluteimage.png\""));
|
| }
|
|
|
| -
|
| -IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeVideos) {
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_HandlesRelativeVideos DISABLED_HandlesRelativeVideos
|
| +#else
|
| +#define MAYBE_HandlesRelativeVideos HandlesRelativeVideos
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| + MAYBE_HandlesRelativeVideos) {
|
| DistillerPageWebContents distiller_page(
|
| shell()->web_contents()->GetBrowserContext(),
|
| shell()->web_contents()->GetContainerBounds().size(),
|
| @@ -262,7 +293,15 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeVideos) {
|
| HasSubstr("src=\"http://www.google.com/absolute_track_fr.vtt\""));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, VisibilityDetection) {
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_VisibilityDetection DISABLED_VisibilityDetection
|
| +#else
|
| +#define MAYBE_VisibilityDetection VisibilityDetection
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| + MAYBE_VisibilityDetection) {
|
| DistillerPageWebContents distiller_page(
|
| shell()->web_contents()->GetBrowserContext(),
|
| shell()->web_contents()->GetContainerBounds().size(),
|
| @@ -289,8 +328,16 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, VisibilityDetection) {
|
| }
|
| }
|
|
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_UsingCurrentWebContentsWrongUrl \
|
| + DISABLED_UsingCurrentWebContentsWrongUrl
|
| +#else
|
| +#define MAYBE_UsingCurrentWebContentsWrongUrl UsingCurrentWebContentsWrongUrl
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| - UsingCurrentWebContentsWrongUrl) {
|
| + MAYBE_UsingCurrentWebContentsWrongUrl) {
|
| std::string url("/bogus");
|
| bool expect_new_web_contents = true;
|
| bool setup_main_frame_observer = true;
|
| @@ -301,8 +348,17 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| wait_for_document_loaded);
|
| }
|
|
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_UsingCurrentWebContentsNoMainFrameObserver \
|
| + DISABLED_UsingCurrentWebContentsNoMainFrameObserver
|
| +#else
|
| +#define MAYBE_UsingCurrentWebContentsNoMainFrameObserver \
|
| + UsingCurrentWebContentsNoMainFrameObserver
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| - UsingCurrentWebContentsNoMainFrameObserver) {
|
| + MAYBE_UsingCurrentWebContentsNoMainFrameObserver) {
|
| std::string url(kSimpleArticlePath);
|
| bool expect_new_web_contents = true;
|
| bool setup_main_frame_observer = false;
|
| @@ -417,7 +473,14 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,
|
| run_loop.Run();
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, MarkupInfo) {
|
| +// Consistently failing for no obvious reason on Android.
|
| +// See: crbug.com/728960.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_MarkupInfo DISABLED_MarkupInfo
|
| +#else
|
| +#define MAYBE_MarkupInfo MarkupInfo
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, MAYBE_MarkupInfo) {
|
| DistillerPageWebContents distiller_page(
|
| shell()->web_contents()->GetBrowserContext(),
|
| shell()->web_contents()->GetContainerBounds().size(),
|
|
|