Reland "Hide URL from lookalike URL warning interstitial."

This is a reland of c9078153
which was reverted because it triggered a bug fixed in
http://crrev.com/c/1483732 .

Original change's description:
> Hide URL from lookalike URL warning interstitial.
>
> This CL adds support for hiding of URLs in the omnibox by security
> interstitials so as to enable it for the lookalike URL interstitial.
>
> Bug: 927924
> Change-Id: I2a7c7311480d6626d2ef27572e326c0a473dc20b
> Reviewed-on: https://chromium-review.googlesource.com/c/1478358
> Commit-Queue: Joe DeBlasio <jdeblasio@chromium.org>
> Reviewed-by: Michael Wasserman <msw@chromium.org>
> Reviewed-by: Carlos IL <carlosil@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#634067}

Bug: 927924
Change-Id: I14e5db4d7eec03b060df25569fa38ce1cd1e8522
Reviewed-on: https://chromium-review.googlesource.com/c/1482940Reviewed-by: Emily Stark <estark@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Commit-Queue: Joe DeBlasio <jdeblasio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635221}

chrome/browser/lookalikes/lookalike_url_interstitial_page.cc

@@ -73,6 +73,10 @@ void LookalikeUrlInterstitialPage::PopulateInterstitialStrings(
 
 void LookalikeUrlInterstitialPage::OnInterstitialClosing() {}
 
+bool LookalikeUrlInterstitialPage::ShouldDisplayURL() const {
+  return false;
+}
+
 // This handles the commands sent from the interstitial JavaScript.
 void LookalikeUrlInterstitialPage::CommandReceived(const std::string& command) {
   if (command == "\"pageLoadComplete\"") {

chrome/browser/lookalikes/lookalike_url_interstitial_page.h

@@ -45,6 +45,7 @@ class LookalikeUrlInterstitialPage
   void PopulateInterstitialStrings(
       base::DictionaryValue* load_time_data) override;
   void OnInterstitialClosing() override;
+  bool ShouldDisplayURL() const override;
   int GetHTMLTemplateId() override;
 
  private:

chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc

@@ -187,6 +187,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
       NavigateToURL(browser, navigated_url);
       navigation_observer.Wait();
       EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
+      EXPECT_TRUE(IsUrlShowing(browser));
     }
     {
       // Navigate to an empty page. This will happen after any
@@ -196,6 +197,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
       NavigateToURL(browser, GURL("about:blank"));
       navigation_observer.Wait();
       EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
+      EXPECT_TRUE(IsUrlShowing(browser));
     }
   }
 
@@ -215,6 +217,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
 
     EXPECT_EQ(LookalikeUrlInterstitialPage::kTypeForTesting,
               GetInterstitialType(web_contents));
+    EXPECT_FALSE(IsUrlShowing(browser));
   }
 
   // Tests that the histogram event |expected_event| is recorded. If the UI is
@@ -297,8 +300,12 @@ class LookalikeUrlNavigationThrottleBrowserTest
 
   base::SimpleTestClock* test_clock() { return &test_clock_; }
 
- private:
-  bool ui_enabled() const { return GetParam() == UIEnabled::kEnabled; }
+ protected:
+  virtual bool ui_enabled() const { return GetParam() == UIEnabled::kEnabled; }
+
+  static bool IsUrlShowing(Browser* browser) {
+    return !browser->location_bar_model()->GetFormattedFullURL().empty();
+  }
 
   // Simulates a link click navigation. We don't use
   // ui_test_utils::NavigateToURL(const GURL&) because it simulates the user
@@ -327,6 +334,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
         browser->tab_strip_model()->GetActiveWebContents();
 
     EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
+    EXPECT_TRUE(IsUrlShowing(browser));
     {
       content::TestNavigationObserver navigation_observer(web_contents, 1);
       NavigateToURL(browser, navigated_url);
@@ -335,6 +343,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
 
     EXPECT_EQ(LookalikeUrlInterstitialPage::kTypeForTesting,
               GetInterstitialType(web_contents));
+    EXPECT_FALSE(IsUrlShowing(browser));
 
     // Clicking the link in the interstitial should remove the interstitial and
     // navigate to the suggested URL.
@@ -347,6 +356,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
 
     EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
     EXPECT_EQ(expected_suggested_url, web_contents->GetURL());
+    EXPECT_TRUE(IsUrlShowing(browser));
 
     // Clicking the link in the interstitial should also remove the original URL
     // from history.
@@ -376,6 +386,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
 
     EXPECT_EQ(LookalikeUrlInterstitialPage::kTypeForTesting,
               GetInterstitialType(web_contents));
+    EXPECT_FALSE(IsUrlShowing(browser));
 
     // Clicking the ignore button in the interstitial should remove the
     // interstitial and navigate to the original URL.
@@ -388,6 +399,7 @@ class LookalikeUrlNavigationThrottleBrowserTest
 
     EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
     EXPECT_EQ(navigated_url, web_contents->GetURL());
+    EXPECT_TRUE(IsUrlShowing(browser));
 
     // Clicking the link should result in the original URL appearing in history.
     ui_test_utils::HistoryEnumerator enumerator(browser->profile());
@@ -399,6 +411,54 @@ class LookalikeUrlNavigationThrottleBrowserTest
   base::SimpleTestClock test_clock_;
 };
 
+class LookalikeUrlInterstitialPageBrowserTest
+    : public LookalikeUrlNavigationThrottleBrowserTest {
+ public:
+  // Checks that navigating to |navigated_url| displays an interstitial with a
+  // hidden URL, and then navigating to other pages shows/hides the URLs
+  // appropriately both when a URL is expected to be hidden (by navigating to
+  // "chrome://newtab") and when expected to be shown (by navigating to
+  // |subsequent_url|).
+  static void TestInterstitialHidesUrlThenRestores(Browser* browser,
+                                                   const GURL& navigated_url,
+                                                   const GURL& subsequent_url) {
+    content::WebContents* web_contents =
+        browser->tab_strip_model()->GetActiveWebContents();
+
+    EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
+    EXPECT_TRUE(IsUrlShowing(browser));
+    {
+      content::TestNavigationObserver navigation_observer(web_contents, 1);
+      NavigateToURL(browser, navigated_url);
+      navigation_observer.Wait();
+    }
+
+    EXPECT_EQ(LookalikeUrlInterstitialPage::kTypeForTesting,
+              GetInterstitialType(web_contents));
+    EXPECT_FALSE(IsUrlShowing(browser));
+
+    {
+      content::TestNavigationObserver navigation_observer(web_contents, 1);
+      ui_test_utils::NavigateToURL(browser, subsequent_url);
+      navigation_observer.Wait();
+    }
+
+    EXPECT_EQ(nullptr, GetCurrentInterstitial(web_contents));
+    EXPECT_TRUE(IsUrlShowing(browser));
+
+    {
+      content::TestNavigationObserver navigation_observer(web_contents, 1);
+      ui_test_utils::NavigateToURL(browser, GURL("chrome://newtab"));
+      navigation_observer.Wait();
+    }
+
+    EXPECT_FALSE(IsUrlShowing(browser));
+  }
+
+ protected:
+  bool ui_enabled() const override { return true; }
+};
+
 INSTANTIATE_TEST_SUITE_P(,
                          LookalikeUrlNavigationThrottleBrowserTest,
                          ::testing::Values(UIEnabled::kDisabled,
@@ -731,3 +791,12 @@ IN_PROC_BROWSER_TEST_P(LookalikeUrlNavigationThrottleBrowserTest,
     TestOnlyInterstitialShown(browser(), kNavigatedUrl);
   }
 }
+
+// Verify that the URL shows normally on pages after a lookalike interstitial.
+IN_PROC_BROWSER_TEST_F(LookalikeUrlInterstitialPageBrowserTest,
+                       UrlShownAfterInterstitial) {
+  const GURL kNavigatedUrl = GetURL("goooglé.com");
+  const GURL kSubsequentUrl = GetURL("example.com");
+  TestInterstitialHidesUrlThenRestores(browser(), kNavigatedUrl,
+                                       kSubsequentUrl);
+}

chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc

@@ -18,6 +18,7 @@
 #include "components/offline_pages/buildflags/buildflags.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/prefs/pref_service.h"
+#include "components/security_interstitials/content/security_interstitial_tab_helper.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -93,6 +94,12 @@ bool ChromeLocationBarModelDelegate::ShouldDisplayURL() const {
   if (!entry)
     return true;
 
+  security_interstitials::SecurityInterstitialTabHelper* tab_helper =
+      security_interstitials::SecurityInterstitialTabHelper::FromWebContents(
+          GetActiveWebContents());
+  if (tab_helper && tab_helper->IsDisplayingInterstitial())
+    return tab_helper->ShouldDisplayURL();
+
   if (entry->IsViewSourceMode() ||
       entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL) {
     return true;

components/security_interstitials/content/security_interstitial_page.cc

@@ -66,6 +66,10 @@ void SecurityInterstitialPage::DontCreateViewForTesting() {
   create_view_ = false;
 }
 
+bool SecurityInterstitialPage::ShouldDisplayURL() const {
+  return true;
+}
+
 std::string SecurityInterstitialPage::GetHTMLContents() {
   base::DictionaryValue load_time_data;
   PopulateInterstitialStrings(&load_time_data);

components/security_interstitials/content/security_interstitial_page.h

@@ -50,6 +50,10 @@ class SecurityInterstitialPage : public content::InterstitialPageDelegate {
   // to e.g. update metrics.
   virtual void OnInterstitialClosing() = 0;
 
+  // Whether a URL should be displayed on this interstitial page. This is
+  // respected by committed interstitials only.
+  virtual bool ShouldDisplayURL() const;
+
  protected:
   // Returns true if the interstitial should create a new navigation entry.
   virtual bool ShouldCreateNewNavigation() const = 0;

components/security_interstitials/content/security_interstitial_tab_helper.cc

@@ -60,6 +60,15 @@ void SecurityInterstitialTabHelper::AssociateBlockingPage(
   helper->SetBlockingPage(navigation_id, std::move(blocking_page));
 }
 
+bool SecurityInterstitialTabHelper::ShouldDisplayURL() const {
+  CHECK(IsDisplayingInterstitial());
+  return blocking_page_for_currently_committed_navigation_->ShouldDisplayURL();
+}
+
+bool SecurityInterstitialTabHelper::IsDisplayingInterstitial() const {
+  return blocking_page_for_currently_committed_navigation_ != nullptr;
+}
+
 security_interstitials::SecurityInterstitialPage*
 SecurityInterstitialTabHelper::
     GetBlockingPageForCurrentlyCommittedNavigationForTesting() {

components/security_interstitials/content/security_interstitial_tab_helper.h

@@ -43,6 +43,12 @@ class SecurityInterstitialTabHelper
       std::unique_ptr<security_interstitials::SecurityInterstitialPage>
           blocking_page);
 
+  // Determines whether a URL should be shown on the current navigation page.
+  bool ShouldDisplayURL() const;
+
+  // Whether this tab helper is tracking a currently-displaying interstitial.
+  bool IsDisplayingInterstitial() const;
+
   security_interstitials::SecurityInterstitialPage*
   GetBlockingPageForCurrentlyCommittedNavigationForTesting();