Reverse accidental enabling of 'use strict' in closure compiler

components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 
 #include <utility>
 
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 164 matching lines @@
     DistillerPageWebContents::CreateNewWebContents(url);
   }
 
   bool new_web_contents_created() { return new_web_contents_created_; }
 
  private:
   bool expect_new_web_contents_;
   bool new_web_contents_created_;
 };
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, BasicDistillationWorks) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       std::unique_ptr<SourcePageHandleWebContents>());
   distiller_page_ = &distiller_page;
 
   base::RunLoop run_loop;
   DistillPage(run_loop.QuitClosure(), kSimpleArticlePath);
   run_loop.Run();
 
   EXPECT_EQ("Test Page Title", distiller_result_->title());
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               HasSubstr("Lorem ipsum"));
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               Not(HasSubstr("questionable content")));
   EXPECT_EQ("", distiller_result_->pagination_info().next_page());
   EXPECT_EQ("", distiller_result_->pagination_info().prev_page());
 }
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeLinks) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       std::unique_ptr<SourcePageHandleWebContents>());
   distiller_page_ = &distiller_page;
 
   base::RunLoop run_loop;
   DistillPage(run_loop.QuitClosure(), kSimpleArticlePath);
   run_loop.Run();
 
   // A relative link should've been updated.
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               ContainsRegex("href=\"http://127.0.0.1:.*/relativelink.html\""));
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               HasSubstr("href=\"http://www.google.com/absolutelink.html\""));
 }
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeImages) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       std::unique_ptr<SourcePageHandleWebContents>());
   distiller_page_ = &distiller_page;
 
   base::RunLoop run_loop;
   DistillPage(run_loop.QuitClosure(), kSimpleArticlePath);
   run_loop.Run();
 
   // A relative link should've been updated.
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               ContainsRegex("src=\"http://127.0.0.1:.*/relativeimage.png\""));
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               HasSubstr("src=\"http://www.google.com/absoluteimage.png\""));
 }
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, HandlesRelativeVideos) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       std::unique_ptr<SourcePageHandleWebContents>());
   distiller_page_ = &distiller_page;
 
   base::RunLoop run_loop;
   DistillPage(run_loop.QuitClosure(), kVideoArticlePath);
   run_loop.Run();
 
   // A relative source/track should've been updated.
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               ContainsRegex("src=\"http://127.0.0.1:.*/relative_video.webm\""));
   EXPECT_THAT(
       distiller_result_->distilled_content().html(),
       ContainsRegex("src=\"http://127.0.0.1:.*/relative_track_en.vtt\""));
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               HasSubstr("src=\"http://www.google.com/absolute_video.ogg\""));
   EXPECT_THAT(distiller_result_->distilled_content().html(),
               HasSubstr("src=\"http://www.google.com/absolute_track_fr.vtt\""));
 }
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, VisibilityDetection) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       std::unique_ptr<SourcePageHandleWebContents>());
   distiller_page_ = &distiller_page;
 
   // visble_style.html and invisible_style.html only differ by the visibility
   // internal stylesheet.
 
   {
     base::RunLoop run_loop;
     DistillPage(run_loop.QuitClosure(), "/visible_style.html");
     run_loop.Run();
     EXPECT_THAT(distiller_result_->distilled_content().html(),
                 HasSubstr("Lorem ipsum"));
   }
 
   {
     base::RunLoop run_loop;
     DistillPage(run_loop.QuitClosure(), "/invisible_style.html");
     run_loop.Run();
     EXPECT_THAT(distiller_result_->distilled_content().html(),
                 Not(HasSubstr("Lorem ipsum")));
   }
 }
 
-// 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,
-                       MAYBE_UsingCurrentWebContentsWrongUrl) {
+                       UsingCurrentWebContentsWrongUrl) {
   std::string url("/bogus");
   bool expect_new_web_contents = true;
   bool setup_main_frame_observer = true;
   bool wait_for_document_loaded = true;
   RunUseCurrentWebContentsTest(url,
                                expect_new_web_contents,
                                setup_main_frame_observer,
                                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,
-                       MAYBE_UsingCurrentWebContentsNoMainFrameObserver) {
+                       UsingCurrentWebContentsNoMainFrameObserver) {
   std::string url(kSimpleArticlePath);
   bool expect_new_web_contents = true;
   bool setup_main_frame_observer = false;
   bool wait_for_document_loaded = true;
   RunUseCurrentWebContentsTest(url,
                                expect_new_web_contents,
                                setup_main_frame_observer,
                                wait_for_document_loaded);
 }
 
@@ skipping 94 matching lines @@
   // It can not crash the loop when returning the result.
   delete distiller_page_;
 
   // Make sure the test ends when it does not crash.
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromSeconds(2));
 
   run_loop.Run();
 }
 
-// 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) {
+IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest, MarkupInfo) {
   DistillerPageWebContents distiller_page(
       shell()->web_contents()->GetBrowserContext(),
       shell()->web_contents()->GetContainerBounds().size(),
       std::unique_ptr<SourcePageHandleWebContents>());
   distiller_page_ = &distiller_page;
 
   base::RunLoop run_loop;
   DistillPage(run_loop.QuitClosure(), "/markup_article.html");
   run_loop.Run();
 
@@ skipping 88 matching lines @@
   ASSERT_TRUE(js_result_);
   ASSERT_TRUE(js_result_->GetAsDictionary(&dict));
 
   ASSERT_TRUE(dict->HasKey("success"));
   bool success;
   ASSERT_TRUE(dict->GetBoolean("success", &success));
   EXPECT_TRUE(success);
 }
 
 }  // namespace dom_distiller