chrome/browser/browsing_data/browsing_data_remover.cc - Issue 839193002: Move ServiceAccessType into //components/keyed_service

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/browsing_data/browsing_data_remover.cc

Issue 839193002: Move ServiceAccessType into //components/keyed_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation on android Created 5 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/bookmarks/chrome_bookmark_client.cc ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/browsing_data_remover.cc

diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc

index 1f7254780b1047309180c65469df6d03ebb984fc..7987a92b972853da4aa464556bc68cac0b1fb197 100644

--- a/chrome/browser/browsing_data/browsing_data_remover.cc

+++ b/chrome/browser/browsing_data/browsing_data_remover.cc

@@ -281,7 +281,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,

if ((remove_mask & REMOVE_HISTORY) && may_delete_history) {

HistoryService* history_service = HistoryServiceFactory::GetForProfile(

- profile_, Profile::EXPLICIT_ACCESS);

+ profile_, ServiceAccessType::EXPLICIT_ACCESS);

if (history_service) {

std::set<GURL> restrict_urls;

if (!remove_origin_.is_empty())

@@ -383,7 +383,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,

// history, so clear them as well.

scoped_refptr<autofill::AutofillWebDataService> web_data_service =

WebDataServiceFactory::GetAutofillWebDataForProfile(

- profile_, Profile::EXPLICIT_ACCESS);

+ profile_, ServiceAccessType::EXPLICIT_ACCESS);

if (web_data_service.get()) {

waiting_for_clear_autofill_origin_urls_ = true;

web_data_service->RemoveOriginURLsModifiedBetween(

@@ -544,8 +544,8 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,

if (remove_mask & REMOVE_PASSWORDS) {

content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords"));

password_manager::PasswordStore* password_store =

- PasswordStoreFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS)

- .get();

+ PasswordStoreFactory::GetForProfile(

+ profile_, ServiceAccessType::EXPLICIT_ACCESS).get();

if (password_store)

password_store->RemoveLoginsCreatedBetween(delete_begin_, delete_end_);

@@ -555,7 +555,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,

content::RecordAction(UserMetricsAction("ClearBrowsingData_Autofill"));

scoped_refptr<autofill::AutofillWebDataService> web_data_service =

WebDataServiceFactory::GetAutofillWebDataForProfile(

- profile_, Profile::EXPLICIT_ACCESS);

+ profile_, ServiceAccessType::EXPLICIT_ACCESS);

if (web_data_service.get()) {

waiting_for_clear_form_ = true;