net/base/net_util.cc - Issue 10578017: Test GURL::spec() usage changes with DEPS rolled to the new version.

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: net/base/net_util.cc

Issue 10578017: Test GURL::spec() usage changes with DEPS rolled to the new version. Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More fixes Created 8 years, 6 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:

Index: net/base/net_util.cc

diff --git a/net/base/net_util.cc b/net/base/net_util.cc

index 126fc327648869bc9059ba31c061ad78ca08633d..7eaf8d865215ee2e25bcef69b10701303a3e358c 100644

--- a/net/base/net_util.cc

+++ b/net/base/net_util.cc

@@ -1694,7 +1694,9 @@ void GetIdentityFromURL(const GURL& url,

}

std::string GetHostOrSpecFromURL(const GURL& url) {

- return url.has_host() ? TrimEndingDot(url.host()) : url.spec();

+ return url.has_host() ?

+ TrimEndingDot(url.host()) :

+ (url.is_valid() ? url.spec() : GURL::EmptyGURL().spec());

}

void AppendFormattedHost(const GURL& url,