Merge 275988 "Move about://-related constants from //content to ..."

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

 // Copyright (c) 2012 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.
 //
 // This test creates a fake safebrowsing service, where we can inject
 // malware and phishing urls.  It then uses a real browser to go to
 // these urls, and sends "goback" or "proceed" commands and verifies
 // they work.
 
 #include "base/bind.h"
@@ skipping 663 matching lines @@
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
-  EXPECT_EQ(
-      GURL(content::kAboutBlankURL),  // Back to "about:blank"
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) {
   GURL url = SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone.
   EXPECT_EQ(url,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
@@ skipping 29 matching lines @@
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
-  EXPECT_EQ(
-      GURL(content::kAboutBlankURL),  // Back to "about:blank"
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeProceed) {
   GURL url = SetupMalwareIframeWarningAndNavigate();
 
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);  // Assert the interstitial is gone
 
   EXPECT_EQ(url,
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
@@ skipping 66 matching lines @@
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed-span"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed-span"));
 
   // The "proceed" command should go back instead, if proceeding is disabled.
   EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
   AssertNoInterstitial(true);
-  EXPECT_EQ(
-      GURL(content::kAboutBlankURL),  // Back to "about:blank"
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 // Verifies that the reporting checkbox is hidden on non-HTTP pages.
 // TODO(mattm): Should also verify that no report is sent, but there isn't a
 // good way to do that in the current design.
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
@@ skipping 13 matching lines @@
 
   EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);   // Assert the interstitial is gone
-  EXPECT_EQ(
-      GURL(content::kAboutBlankURL),  // Back to "about:blank"
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GURL(url::kAboutBlankURL),  // Back to "about:blank"
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
 
   EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("phishing-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
   AssertNoInterstitial(false);  // Assert the interstitial is gone
-  EXPECT_EQ(
-      GURL(content::kAboutBlankURL),  // We are back to "about:blank".
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GURL(url::kAboutBlankURL),  // We are back to "about:blank".
+            browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
 // http://crbug.com/247763
 #if defined(OS_WIN)
 // Temporarily re-enabled to get some logs.
 #define MAYBE_PhishingProceed PhishingProceed
 #else
 #define MAYBE_PhishingProceed PhishingProceed
 #endif
 
@@ skipping 38 matching lines @@
   LOG(INFO) << "2";
   AssertNoInterstitial(false);  // Assert the interstitial is gone
 
   LOG(INFO) << "3";
   // We are in the help page.
   EXPECT_EQ(
       "/transparencyreport/safebrowsing/",
        browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
   LOG(INFO) << "4";
 }