content/browser/frame_host/navigation_controller_impl_browsertest.cc - Issue 176883012: Set the original url correctly if the frame is loaded via loadData

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl_browsertest.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: add // static comment Created 6 years, 9 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 unified diff | Download patch

OLD	NEW
(Empty)
	1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
	darin (slow to review) 2014/03/27 08:10:28 nit: Please drop the "(c)" from the header. We use nit: Please drop the "(c)" from the header. We used to include that, but the policy for new files is to leave it out. Thanks! hush (inactive) 2014/03/27 20:15:00 Done. Show quoted text On 2014/03/27 08:10:28, darin wrote: > nit: Please drop the "(c)" from the header. We used to include that, but the > policy for new files is to leave it out. Thanks! Done.
	2 // Use of this source code is governed by a BSD-style license that can be

	3 // found in the LICENSE file.

	4

	5 #include "base/bind.h"

	6 #include "content/browser/frame_host/navigation_controller_impl.h"

	7 #include "content/browser/frame_host/navigation_entry_impl.h"

	8 #include "content/public/browser/web_contents.h"

	9 #include "content/shell/browser/shell.h"

	10 #include "content/test/content_browser_test.h"

	11 #include "content/test/content_browser_test_utils.h"

	12

	13 namespace content {
	darin (slow to review) 2014/03/27 08:10:28 nit: add a new line here between the namespace and nit: add a new line here between the namespace and the class. hush (inactive) 2014/03/27 20:15:00 Done. Show quoted text On 2014/03/27 08:10:28, darin wrote: > nit: add a new line here between the namespace and the class. Done.
	14 class NavigationControllerBrowserTest : public ContentBrowserTest {

	15 };

	16

	17 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, LoadDataWithBaseURL) {

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

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

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

	21

	22 NavigationController& controller = shell()->web_contents()->GetController();
	darin (slow to review) 2014/03/27 08:10:28 nit: We generally avoid non-const references in Ch nit: We generally avoid non-const references in Chromium code. I'm surprised to see GetController() return a non-const reference. That said, you can use a const reference here because GetVisibleEntry() is a const method. hush (inactive) 2014/03/27 20:15:00 Done. Show quoted text On 2014/03/27 08:10:28, darin wrote: > nit: We generally avoid non-const references in Chromium code. I'm surprised to > see GetController() return a non-const reference. That said, you can use a const > reference here because GetVisibleEntry() is a const method. Done.
	23 // load data. Blocks until it is done.

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

	25

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

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

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

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

	30 }

	31 } // namespace content
	darin (slow to review) 2014/03/27 08:10:28 nit: add a new line above here. nit: add a new line above here. hush (inactive) 2014/03/27 20:15:00 Done. Show quoted text On 2014/03/27 08:10:28, darin wrote: > nit: add a new line above here. Done.
OLD	NEW

« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | content/renderer/render_frame_impl.cc » ('J')