chrome/browser/search_engines/template_url_service.cc - Issue 10908044: Refuse invalid SearchProvider and OSDD suggest URLs; etc.

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: chrome/browser/search_engines/template_url_service.cc

Issue 10908044: Refuse invalid SearchProvider and OSDD suggest URLs; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments. Created 8 years, 3 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: chrome/browser/search_engines/template_url_service.cc

diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc

index 598f07bb48f43a4a079b97c0163f2b12cfcb6e76..10e157d62eba6a14e5e4aa340c142b25c3360908 100644

--- a/chrome/browser/search_engines/template_url_service.cc

+++ b/chrome/browser/search_engines/template_url_service.cc

@@ -309,7 +309,6 @@ TemplateURLService::~TemplateURLService() {

// static

string16 TemplateURLService::GenerateKeyword(const GURL& url) {

- DCHECK(url.is_valid());

// Strip "www." off the front of the keyword; otherwise the keyword won't work

// properly. See http://code.google.com/p/chromium/issues/detail?id=6984 .

// Special case: if the host was exactly "www." (not sure this can happen but