Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1900)

Unified Diff: content/public/test/content_browser_test_utils.cc

Issue 176883012: Set the original url correctly if the frame is loaded via loadData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase correctly Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/test/content_browser_test_utils.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/content_browser_test_utils.cc
diff --git a/content/public/test/content_browser_test_utils.cc b/content/public/test/content_browser_test_utils.cc
index c2de31469d369c8229be03e06fa722d075235e5f..d9448f0fc4dd1808653208cb83b890efce18d48d 100644
--- a/content/public/test/content_browser_test_utils.cc
+++ b/content/public/test/content_browser_test_utils.cc
@@ -43,6 +43,15 @@ void NavigateToURLBlockUntilNavigationsComplete(Shell* window,
same_tab_observer.Wait();
}
+void LoadDataWithBaseURL(Shell* window, const GURL& url,
+ const std::string data, const GURL& base_url) {
+ WaitForLoadStop(window->web_contents());
+ TestNavigationObserver same_tab_observer(window->web_contents(), 1);
+
+ window->LoadDataWithBaseURL(url, data, base_url);
+ same_tab_observer.Wait();
+}
+
void NavigateToURL(Shell* window, const GURL& url) {
NavigateToURLBlockUntilNavigationsComplete(window, url, 1);
}
« no previous file with comments | « content/public/test/content_browser_test_utils.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698