Use PasswordStoreDefault on Android

chrome/browser/password_manager/password_store_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/password_store_factory.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "chrome/browser/password_manager/login_database.h"
 #include "chrome/browser/password_manager/password_store_default.h"
@@ skipping 51 matching lines @@
         "PasswordStore",
         ProfileDependencyManager::GetInstance()) {
   // TODO(erg): We must always depend on WebDB; we don't want the dependency
   // graph to be different based on platform.
   //
   // DependsOn(WebDataServiceFactory::GetInstance());
 }
 
 PasswordStoreFactory::~PasswordStoreFactory() {}
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)

[Elliot Glaysher, 2012/03/14 17:19:54]

Do you need a !defined(ANDROID) here, too?

 LocalProfileId PasswordStoreFactory::GetLocalProfileId(
     PrefService* prefs) const {
   LocalProfileId id = prefs->GetInteger(prefs::kLocalProfileId);
   if (id == kInvalidLocalProfileId) {
     // Note that there are many more users than this. Thus, by design, this is
     // not a unique id. However, it is large enough that it is very unlikely
     // that it would be repeated twice on a single machine. It is still possible
     // for that to occur though, so the potential results of it actually
     // happening should be considered when using this value.
     static const LocalProfileId kLocalProfileIdMask =
@@ skipping 22 matching lines @@
 #if defined(OS_WIN)
   ps = new PasswordStoreWin(
       login_db, profile,
       profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
 #elif defined(OS_MACOSX)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseMockKeychain)) {
     ps = new PasswordStoreMac(new MockKeychain(), login_db);
   } 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.
   // (In all cases we fall back on the basic store in case of failure.)
   base::nix::DesktopEnvironment desktop_env;
   std::string store_type =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kPasswordStore);
   if (store_type == "kwallet") {
     desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE4;
@@ skipping 51 matching lines @@
 
   if (!ps || !ps->Init()) {
     NOTREACHED() << "Could not initialize password manager.";
     return NULL;
   }
 
   return ps.release();
 }
 
 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);
 
   // Notice that the preprocessor conditions above are exactly those that will
   // result in using PasswordStoreX in CreatePasswordStore() below.
   PasswordStoreX::RegisterUserPrefs(prefs);
 #endif
 }
 
 bool PasswordStoreFactory::ServiceRedirectedInIncognito() {
   return true;
 }
 
 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() {
   return true;
 }