diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-12 15:48:10 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-20 15:35:13 +0100 |
| commit | 695dfbca993baed056396f64d75f03d50c3d3e2f (patch) | |
| tree | b8a7739b481c6238f0378f6203f8cd0547d291bb /android | |
| parent | 98ae37e9166a7cee71e2a6b150c5aef1fc24fbcb (diff) | |
| download | external_chromium-695dfbca993baed056396f64d75f03d50c3d3e2f.zip external_chromium-695dfbca993baed056396f64d75f03d50c3d3e2f.tar.gz external_chromium-695dfbca993baed056396f64d75f03d50c3d3e2f.tar.bz2 | |
Merge Chromium at 10.0.621.0: Compile fix, CreateUserPrefService removed upstream.
Function removed in CL:
http://codereview.chromium.org/5646003
Change-Id: I0debd2e098e06282543e11ca2d6f9f79e287472a
Diffstat (limited to 'android')
| -rw-r--r-- | android/autofill/profile_android.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/autofill/profile_android.cc b/android/autofill/profile_android.cc index 3cc51f1..16d2816 100644 --- a/android/autofill/profile_android.cc +++ b/android/autofill/profile_android.cc @@ -55,7 +55,7 @@ PersonalDataManager* ProfileImplAndroid::GetPersonalDataManager() PrefService* ProfileImplAndroid::GetPrefs() { if (!preferences_.get()) { - preferences_.reset(PrefService::CreateUserPrefService(path_)); + preferences_.reset(PrefService::CreatePrefService(path_, NULL, NULL)); } return preferences_.get(); } |