| Index: content/public/test/browser_test_utils.cc
|
| diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
|
| index 78d1f2b7dab688ce357702c8e40d028f5c575de5..89dd3430e96dbca0330338b1fc035951d215e908 100644
|
| --- a/content/public/test/browser_test_utils.cc
|
| +++ b/content/public/test/browser_test_utils.cc
|
| @@ -259,6 +259,26 @@ scoped_ptr<net::test_server::HttpResponse> CrossSiteRedirectResponseHandler(
|
|
|
| } // namespace
|
|
|
| +bool NavigateIframeToURL(WebContents* web_contents,
|
| + std::string iframe_id,
|
| + const GURL& url) {
|
| + // TODO(creis): This should wait for LOAD_STOP, but cross-site subframe
|
| + // navigations generate extra DidStartLoading and DidStopLoading messages.
|
| + // Until we replace swappedout:// with frame proxies, we need to listen for
|
| + // something else. For now, we trigger NEW_SUBFRAME navigations and listen
|
| + // for commit. See https://crbug.com/436250.
|
| + std::string script = base::StringPrintf(
|
| + "setTimeout(\""
|
| + "var iframes = document.getElementById('%s');iframes.src='%s';"
|
| + "\",0)",
|
| + iframe_id.c_str(), url.spec().c_str());
|
| + WindowedNotificationObserver load_observer(
|
| + NOTIFICATION_NAV_ENTRY_COMMITTED,
|
| + Source<NavigationController>(&web_contents->GetController()));
|
| + bool result = ExecuteScript(web_contents, script);
|
| + load_observer.Wait();
|
| + return result;
|
| +}
|
|
|
| GURL GetFileUrlWithQuery(const base::FilePath& path,
|
| const std::string& query_string) {
|
|
|