Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: components/autofill/core/browser/personal_data_manager.cc

Issue 52713006: Parameterize the PrefService that PersonalDataManager uses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Response to review, fix unit tests Created 7 years, 1 month 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
Index: components/autofill/core/browser/personal_data_manager.cc
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index 44ec88f5278ce44a481f32b240365efed059094c..9785a01fbb111a4ee956de4a2330b7d4fc34b395 100644
--- a/components/autofill/core/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -25,7 +25,6 @@
#include "components/autofill/core/browser/validation.h"
#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
#include "components/autofill/core/common/autofill_pref_names.h"
-#include "components/user_prefs/user_prefs.h"
#include "content/public/browser/browser_context.h"
namespace autofill {
@@ -156,8 +155,10 @@ PersonalDataManager::PersonalDataManager(const std::string& app_locale)
metric_logger_(new AutofillMetrics),
has_logged_profile_count_(false) {}
-void PersonalDataManager::Init(content::BrowserContext* browser_context) {
+void PersonalDataManager::Init(content::BrowserContext* browser_context,
+ PrefService* pref_service) {
browser_context_ = browser_context;
+ pref_service_ = pref_service;
if (!browser_context_->IsOffTheRecord())
metric_logger_->LogIsAutofillEnabledAtStartup(IsAutofillEnabled());
@@ -549,8 +550,7 @@ bool PersonalDataManager::IsDataLoaded() const {
}
const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles() const {
- if (!user_prefs::UserPrefs::Get(browser_context_)->GetBoolean(
- prefs::kAutofillAuxiliaryProfilesEnabled)) {
+ if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled)) {
return web_profiles();
}
@@ -704,8 +704,7 @@ void PersonalDataManager::GetCreditCardSuggestions(
}
bool PersonalDataManager::IsAutofillEnabled() const {
- return user_prefs::UserPrefs::Get(browser_context_)->GetBoolean(
- prefs::kAutofillEnabled);
+ return pref_service_->GetBoolean(prefs::kAutofillEnabled);
}
// static
@@ -1050,6 +1049,10 @@ void PersonalDataManager::set_browser_context(
browser_context_ = context;
}
+void PersonalDataManager::set_pref_service(PrefService* pref_service) {
+ pref_service_ = pref_service;
+}
+
std::string PersonalDataManager::MostCommonCountryCodeFromProfiles() const {
// Count up country codes from existing profiles.
std::map<std::string, int> votes;

Powered by Google App Engine
This is Rietveld 408576698