components/search_engines/template_url_service.h - Issue 2682453002: Changed keywords conflicts resolution for extensions search engines.

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: components/search_engines/template_url_service.h

Issue 2682453002: Changed keywords conflicts resolution for extensions search engines. (Closed)

Patch Set: Rebase on master Created 3 years, 10 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: components/search_engines/template_url_service.h

diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h

index a0368a31078bccf32142651047df2388b11b4da7..4df3ff8d822c08896bf29044c90e5573521c95b4 100644

--- a/components/search_engines/template_url_service.h

+++ b/components/search_engines/template_url_service.h

@@ -414,6 +414,9 @@ class TemplateURLService : public WebDataServiceConsumer,

FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, ChangeGoogleBaseValue);

FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, MergeDeletesUnusedProviders);

FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, AddExtensionKeyword);

+ FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, ExtensionsWithSameKeywords);

+ FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest,

+ DefaultExtensionAndUserEnginesWithSameKeywords);

FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, LastVisitedTimeUpdate);

FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest, UniquifyKeyword);

FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,