content/browser/frame_host/navigation_controller_impl_browsertest.cc - Issue 1449793002: data_with_base_url

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigation_controller_impl_browsertest.cc

Issue 1449793002: data_with_base_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix tests Created 5 years, 1 month 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/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | content/browser/frame_host/navigation_entry_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc

diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc

index 1c93b3d35067b26423e2f6dc27f80e2027564909..0773d005b625fbfe753731337e636b1f2892a484 100644

--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc

+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc

@@ -70,16 +70,10 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, LoadDataWithBaseURL) {

const GURL base_url("http://baseurl");

const GURL history_url("http://historyurl");

const std::string data = "<html><body>foo</body></html>";

- const NavigationController& controller =

- shell()->web_contents()->GetController();

- // Load data. Blocks until it is done.

content::LoadDataWithBaseURL(shell(), history_url, data, base_url);

- // We should use history_url instead of the base_url as the original url of

- // this navigation entry, because base_url is only used for resolving relative

- // paths in the data, or enforcing same origin policy.

- EXPECT_EQ(controller.GetVisibleEntry()->GetOriginalRequestURL(), history_url);

+ ReloadBlockUntilNavigationsComplete(shell(), 1);

+ EXPECT_TRUE(

+ ExecuteScript(shell()->web_contents(), "console.log('Success');"));

}

IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, UniqueIDs) {