Add WaitForInterstitialReady to browser_test_utils.

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 known-
 // threat 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"
 #include "base/command_line.h"
@@ skipping 494 matching lines @@
 
   content::RenderViewHost* GetRenderViewHost() {
     InterstitialPage* interstitial = InterstitialPage::GetInterstitialPage(
         browser()->tab_strip_model()->GetActiveWebContents());
     if (!interstitial)
       return NULL;
     return interstitial->GetMainFrame()->GetRenderViewHost();
   }
 
   bool WaitForReady() {
-    content::RenderViewHost* rvh = GetRenderViewHost();
-    if (!rvh)
-      return false;
-    // Wait until all <script> tags have executed, including jstemplate.
-    // TODO(joaodasilva): it would be nice to avoid the busy loop, though in
-    // practice it spins at most once or twice.
-    std::string ready_state;
-    do {
-      scoped_ptr<base::Value> value = content::ExecuteScriptAndGetValue(
-          rvh->GetMainFrame(), "document.readyState");
-      if (!value.get() || !value->GetAsString(&ready_state))
-        return false;
-    } while (ready_state != "complete");
-    return true;
+    InterstitialPage* interstitial = InterstitialPage::GetInterstitialPage(
+        browser()->tab_strip_model()->GetActiveWebContents());

[mattm, 2015/01/22 02:28:32]

I think there should be a "if (!interstitial) return false;" here.

[meacer, 2015/01/22 03:17:50]

Done.

+    return content::WaitForInterstitialReady(interstitial);
   }
 
   Visibility GetVisibility(const std::string& node_id) {
     content::RenderViewHost* rvh = GetRenderViewHost();
     if (!rvh)
       return VISIBILITY_ERROR;
     scoped_ptr<base::Value> value = content::ExecuteScriptAndGetValue(
         rvh->GetMainFrame(),
         "var node = document.getElementById('" + node_id + "');\n"
         "if (node)\n"
@@ skipping 257 matching lines @@
           ? "/transparencyreport/safebrowsing/"
           : "/safebrowsing/diagnostic",
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().path());
 }
 
 INSTANTIATE_TEST_CASE_P(SafeBrowsingBlockingPageBrowserTestWithThreatType,
                         SafeBrowsingBlockingPageBrowserTest,
                         testing::Values(SB_THREAT_TYPE_URL_MALWARE,
                                         SB_THREAT_TYPE_URL_PHISHING,
                                         SB_THREAT_TYPE_URL_UNWANTED));