Add WaitForInterstitialReady to browser_test_utils.

content/public/test/browser_test_utils.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 
 #include <queue>
 #include <string>
 #include <vector>
@@ skipping 34 matching lines @@
 // A collections of functions designed for use with content_browsertests and
 // browser_tests.
 // TO BE CLEAR: any function here must work against both binaries. If it only
 // works with browser_tests, it should be in chrome\test\base\ui_test_utils.h.
 // If it only works with content_browsertests, it should be in
 // content\test\content_browser_test_utils.h.
 
 namespace content {
 
 class BrowserContext;
+class InterstitialPage;

[mattm, 2015/01/22 04:51:27]

no longer needed

[meacer, 2015/01/22 18:31:37]

Done.

 class MessageLoopRunner;
 class RenderViewHost;
 class WebContents;
 
 // Navigate a frame with ID |iframe_id| to |url|, blocking until the navigation
 // finishes.  Uses a renderer-initiated navigation from script code in the
 // main frame.
 bool NavigateIframeToURL(WebContents* web_contents,
                          std::string iframe_id,
                          const GURL& url);
@@ skipping 171 matching lines @@
 // Waits for an interstitial page to detach from given web contents.
 void WaitForInterstitialDetach(content::WebContents* web_contents);
 
 // Runs task and waits for an interstitial page to detach from given web
 // contents. Prefer this over WaitForInterstitialDetach if web_contents may be
 // destroyed by the time WaitForInterstitialDetach is called (e.g. when waiting
 // for an interstitial detach after closing a tab).
 void RunTaskAndWaitForInterstitialDetach(content::WebContents* web_contents,
                                          const base::Closure& task);
 
+// Waits until all resources have loaded in the given RenderFrameHost.
+bool WaitForRenderFrameReady(RenderFrameHost* rfh);

[Paweł Hajdan Jr., 2015/01/22 15:43:10]

nit: Please add WARN_UNUSED_RESULT.

[meacer, 2015/01/22 18:31:37]

Done.

+
 // Watches title changes on a WebContents, blocking until an expected title is
 // set.
 class TitleWatcher : public WebContentsObserver {
  public:
   // |web_contents| must be non-NULL and needs to stay alive for the
   // entire lifetime of |this|. |expected_title| is the title that |this|
   // will wait for.
   TitleWatcher(WebContents* web_contents,
                const base::string16& expected_title);
   ~TitleWatcher() override;
@@ skipping 127 matching lines @@
   WebContents* web_contents_;
   scoped_ptr<RenderViewCreatedObserver> child_observer_;
   scoped_refptr<MessageLoopRunner> runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsAddedObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_