Delete some of the unused NoScript browser tests

Change-Id: Ia5614d5ae288ad82656e6f86271dbeaa7a24359a
Bug: 1095566
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446516Reviewed-by: Sophie Chang <sophiechang@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813858}

chrome/browser/previews/defer_all_script_browsertest.cc

@@ -242,6 +242,14 @@ IN_PROC_BROWSER_TEST_F(
       entry, UkmDeferEntry::kforce_deferred_scripts_mainframeName, 2);
   test_ukm_recorder.ExpectEntryMetric(
       entry, UkmDeferEntry::kforce_deferred_scripts_mainframe_externalName, 1);
+
+  // Opt out of the Preview page.
+  PreviewsUITabHelper::FromWebContents(
+      browser()->tab_strip_model()->GetActiveWebContents())
+      ->ReloadWithoutPreviews();
+
+  histogram_tester.ExpectBucketCount(
+      "Previews.OptOut.UserOptedOut.DeferAllScript", 1, 1);
 }
 
 // Test with an incognito browser.

chrome/browser/previews/previews_browsertest.cc

@@ -263,63 +263,8 @@ INSTANTIATE_TEST_SUITE_P(ShouldSkipPreview,
                          PreviewsNoScriptBrowserTest,
                          ::testing::Bool());
 
-// Loads a webpage that has both script and noscript tags and also requests
-// a script resource. Verifies that the noscript tag is evaluated and the
-// script resource is not loaded.
-IN_PROC_BROWSER_TEST_P(
-    PreviewsNoScriptBrowserTest,
-    DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(NoScriptPreviewsEnabled)) {
-  GURL url = https_url();
-
-  // Whitelist NoScript for https_hint_setup_url()'s' host.
-  SetUpNoScriptWhitelist(https_hint_setup_url());
-
-  base::HistogramTester histogram_tester;
-  ui_test_utils::NavigateToURL(browser(), url);
-
-  // Verify loaded noscript tag triggered css resource but not js one.
-  EXPECT_TRUE(noscript_css_requested());
-  EXPECT_FALSE(noscript_js_requested());
-
-  // Verify info bar presented via histogram check.
-  RetryForHistogramUntilCountReached(&histogram_tester,
-                                     "Previews.PreviewShown.NoScript", 1);
-}
-
-IN_PROC_BROWSER_TEST_P(
-    PreviewsNoScriptBrowserTest,
-    DISABLE_ON_WIN_MAC_CHROMEOS(NoScriptPreviewsEnabled_Incognito)) {
-  GURL url = https_url();
-
-  // Whitelist NoScript for https_hint_setup_url()'s' host.
-  SetUpNoScriptWhitelist(https_hint_setup_url());
-
-  base::HistogramTester histogram_tester;
-  Browser* incognito = CreateIncognitoBrowser();
-  ASSERT_FALSE(PreviewsServiceFactory::GetForProfile(incognito->profile()));
-  ASSERT_TRUE(PreviewsServiceFactory::GetForProfile(browser()->profile()));
-
-  ui_test_utils::NavigateToURL(incognito, url);
-
-  // Verify JS was loaded indicating that NoScript preview was not triggered.
-  EXPECT_FALSE(noscript_css_requested());
-  EXPECT_TRUE(noscript_js_requested());
-}
-
-IN_PROC_BROWSER_TEST_P(
-    PreviewsNoScriptBrowserTest,
-    DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(NoScriptPreviewsForHttp)) {
-  GURL url = http_url();
 
-  // Whitelist NoScript for http_hint_setup_url() host.
-  SetUpNoScriptWhitelist(http_hint_setup_url());
-
-  ui_test_utils::NavigateToURL(browser(), url);
 
-  // Verify loaded noscript tag triggered css resource but not js one.
-  EXPECT_TRUE(noscript_css_requested());
-  EXPECT_FALSE(noscript_js_requested());
-}
 
 IN_PROC_BROWSER_TEST_P(PreviewsNoScriptBrowserTest,
                        DISABLE_ON_WIN_MAC_CHROMEOS(
@@ -340,67 +285,7 @@ IN_PROC_BROWSER_TEST_P(PreviewsNoScriptBrowserTest,
       "Previews.CacheControlNoTransform.BlockedPreview", 5 /* NoScript */, 1);
 }
 
-IN_PROC_BROWSER_TEST_P(PreviewsNoScriptBrowserTest,
-                       DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(
-                           NoScriptPreviewsEnabledHttpRedirectToHttps)) {
-  GURL url = redirect_url();
-
-  // Whitelist NoScript for http_hint_setup_url() host.
-  SetUpNoScriptWhitelist(http_hint_setup_url());
-
-  base::HistogramTester histogram_tester;
-  ui_test_utils::NavigateToURL(browser(), url);
-
-  // Verify loaded noscript tag triggered css resource but not js one.
-  EXPECT_TRUE(noscript_css_requested());
-  EXPECT_FALSE(noscript_js_requested());
-
-  // Verify info bar presented via histogram check.
-  RetryForHistogramUntilCountReached(&histogram_tester,
-                                     "Previews.PreviewShown.NoScript", 1);
-}
-
-IN_PROC_BROWSER_TEST_P(
-    PreviewsNoScriptBrowserTest,
-    DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(NoScriptPreviewsRecordsOptOut)) {
-  GURL url = redirect_url();
-
-  // Whitelist NoScript for http_hint_setup_url()'s' host.
-  SetUpNoScriptWhitelist(http_hint_setup_url());
-
-  base::HistogramTester histogram_tester;
-
-  // Navigate to a NoScript Preview page.
-  ui_test_utils::NavigateToURL(browser(), url);
-
-  // Terminate the previous page (non-opt out) and pull up a new NoScript page.
-  ui_test_utils::NavigateToURL(browser(), url);
-  histogram_tester.ExpectUniqueSample("Previews.OptOut.UserOptedOut.NoScript",
-                                      0, 1);
-
-  // Opt out of the NoScript Preview page.
-  PreviewsUITabHelper::FromWebContents(
-      browser()->tab_strip_model()->GetActiveWebContents())
-      ->ReloadWithoutPreviews();
-
-  histogram_tester.ExpectBucketCount("Previews.OptOut.UserOptedOut.NoScript", 1,
-                                     1);
-}
-
-IN_PROC_BROWSER_TEST_P(
-    PreviewsNoScriptBrowserTest,
-    DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(NoScriptPreviewsEnabledByWhitelist)) {
-  GURL url = https_url();
-
-  // Whitelist NoScript for https_hint_setup_url()'s' host.
-  SetUpNoScriptWhitelist(https_hint_setup_url());
-
-  ui_test_utils::NavigateToURL(browser(), url);
 
-  // Verify loaded noscript tag triggered css resource but not js one.
-  EXPECT_TRUE(noscript_css_requested());
-  EXPECT_FALSE(noscript_js_requested());
-}
 
 IN_PROC_BROWSER_TEST_P(
     PreviewsNoScriptBrowserTest,

chrome/browser/previews/previews_test_util.h

@@ -42,14 +42,4 @@ void RetryForHistogramUntilCountReached(base::HistogramTester* histogram_tester,
 #define DISABLE_ON_WIN_MAC_CHROMEOS(x) x
 #endif
 
-// Previews InfoBar (which these tests trigger) does not work on Mac.
-// See https://crbug.com/782322 for details. Also occasional flakes on win7
-// (https://crbug.com/789542) and linux (https://crbug.com/1095566).
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) || \
-    defined(OS_LINUX)
-#define DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(x) DISABLED_##x
-#else
-#define DISABLE_ON_WIN_MAC_CHROMEOS_LINUX(x) x
-#endif
-
 #endif  // CHROME_BROWSER_PREVIEWS_PREVIEWS_TEST_UTIL_H_