| Index: chrome/browser/password_manager/password_store_factory.cc
|
| diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
|
| index a143c28ade0060238de2d7da5ee172954d82b450..7ee76d7d74971c920dc25ebf3f41c976a8e7437d 100644
|
| --- a/chrome/browser/password_manager/password_store_factory.cc
|
| +++ b/chrome/browser/password_manager/password_store_factory.cc
|
| @@ -112,12 +112,11 @@ RefcountedProfileKeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
|
| } else {
|
| ps = new PasswordStoreMac(new MacKeychain(), login_db);
|
| }
|
| -#elif defined(OS_CHROMEOS)
|
| +#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
|
| // For now, we use PasswordStoreDefault. We might want to make a native
|
| // backend for PasswordStoreX (see below) in the future though.
|
| ps = new PasswordStoreDefault(
|
| - login_db, profile,
|
| - profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
|
| + login_db, profile, profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
|
| #elif defined(OS_POSIX)
|
| // On POSIX systems, we try to use the "native" password management system of
|
| // the desktop environment currently running, allowing GNOME Keyring in XFCE.
|
| @@ -189,7 +188,8 @@ RefcountedProfileKeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
|
| }
|
|
|
| void PasswordStoreFactory::RegisterUserPrefs(PrefService* prefs) {
|
| -#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
|
| +#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) \
|
| + && defined(OS_POSIX)
|
| prefs->RegisterIntegerPref(prefs::kLocalProfileId,
|
| kInvalidLocalProfileId,
|
| PrefService::UNSYNCABLE_PREF);
|
|
|