Relanding https://chromiumcodereview.appspot.com/10694037 after a revert. The original CL failed on…

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 394f2c659b1ea8b87310be761a9a757ccc14f9c2..2366ce2079df90eb7425a3c2ecf29d4eba4c8b57 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -8,6 +8,8 @@
 // they work.
 
 #include "base/bind.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -24,6 +26,7 @@
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/test/test_browser_thread.h"
@@ -369,6 +372,38 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest {
     SendCommand("\"proceed\"");
   }
 
+  bool GetProceedLinkIsHidden(bool* result) {
+    InterstitialPage* interstitial = InterstitialPage::GetInterstitialPage(
+        chrome::GetActiveWebContents(browser()));
+    if (!interstitial)
+      return false;
+    content::RenderViewHost* rvh = interstitial->GetRenderViewHostForTesting();
+    if (!rvh)
+      return false;
+    // Wait until jstemplate is finished.
+    std::string ready_state;
+    do {
+      ready_state.clear();
+      scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(
+          string16(),
+          ASCIIToUTF16("document.readyState;")));
+      if (!value.get() || !value->GetAsString(&ready_state))
+        return false;
+    } while (ready_state == "loading");

[Mattias Nissler (ping if slow), 2012/07/09 08:32:26]

I guess this loop spins pretty fast and thus eats CPU. Is this a common thing to
do and/or do we have better alternatives? (I'm not an expert on this though,
maybe you want somebody who knows this stuff better to take a look).

[Joao da Silva, 2012/07/10 09:52:20]

I've had a deeper look into this. document.readyState goes from 'loading' to
'interactive' or 'complete' quite fast, and this loops once or twice before
proceeding. I couldn't find a nicer way to make sure that the page has finished
loading.

The generated page consists of the malware_block.html file, with a couple of
<script> tags appended: the i18n-template code, jstemplate code, the
templateData as a global object, and a last <script> that invokes jstProcess on
the template_root element (using templateData). So the test fails because the
resource is loaded and the page is parsed, but these scripts haven't executed
yet.

A simpler fix is to execute jstProcess again (this is supported by jstemplate)
before inspecting, to make sure it has processed the page. That fixes the test,
but I still wonder if other tests may be racing against scripts that should
execute immediately. I'll ping chromium-dev to see if someone has any hints on
this.

+    // Now get the display style for the "proceed anyway" div.
+    scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(
+        string16(),
+        ASCIIToUTF16("var list = document.querySelectorAll("
+                     "'div[jsdisplay=\"!proceedDisabled\"]');"
+                     "if (list.length == 1)\n"
+                     "  list[0].style.display === 'none';\n"
+                     "else\n"
+                     "  'Fail with non-boolean result value';\n")));
+    if (!value.get())
+      return false;
+    return value->GetAsBoolean(result);
+  }
+
  protected:
   TestMalwareDetailsFactory details_factory_;
 
@@ -406,6 +441,10 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareDontProceed) {
 
   ui_test_utils::NavigateToURL(browser(), url);
 
+  bool hidden = false;
+  EXPECT_TRUE(GetProceedLinkIsHidden(&hidden));
+  EXPECT_FALSE(hidden);
+
   SendCommand("\"takeMeBack\"");   // Simulate the user clicking "back"
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
@@ -562,3 +601,28 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
   EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
   AssertReportSent();
 }
+
+// Verifies that the "proceed anyway" link isn't available when it is disabled
+// by the corresponding policy. Also verifies that sending the "proceed"
+// command anyway doesn't advance to the malware site.
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ProceedDisabled) {
+  // Simulate a policy disabling the "proceed anyway" link.
+  browser()->profile()->GetPrefs()->SetBoolean(
+      prefs::kSafeBrowsingProceedAnywayDisabled, true);
+
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_MALWARE);
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  // The "proceed anyway" link should be hidden.
+  bool hidden = false;
+  EXPECT_TRUE(GetProceedLinkIsHidden(&hidden));
+  EXPECT_TRUE(hidden);
+
+  // The "proceed" command should go back instead, if proceeding is disabled.
+  SendCommand("\"proceed\"");
+  AssertNoInterstitial(true);
+  EXPECT_EQ(
+      GURL(chrome::kAboutBlankURL),   // Back to "about:blank"
+      chrome::GetActiveWebContents(browser())->GetURL());
+}