Moved WebDataService to ProfileKeyedService

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.h"
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/password_store_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/password_manager/password_store_mac.h"
 #include "crypto/keychain_mac.h"
 #include "crypto/mock_keychain_mac.h"
@@ skipping 32 matching lines @@
 
 // static
 PasswordStoreFactory* PasswordStoreFactory::GetInstance() {
   return Singleton<PasswordStoreFactory>::get();
 }
 
 PasswordStoreFactory::PasswordStoreFactory()
     : RefcountedProfileKeyedServiceFactory(
         "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());
+  DependsOn(WebDataServiceFactory::GetInstance());
 }
 
 PasswordStoreFactory::~PasswordStoreFactory() {}
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && \
     defined(OS_POSIX)
 LocalProfileId PasswordStoreFactory::GetLocalProfileId(
     PrefService* prefs) const {
   LocalProfileId id = prefs->GetInteger(prefs::kLocalProfileId);
   if (id == kInvalidLocalProfileId) {
@@ skipping 21 matching lines @@
   login_db_file_path = login_db_file_path.Append(chrome::kLoginDataFileName);
   LoginDatabase* login_db = new LoginDatabase();
   if (!login_db->Init(login_db_file_path)) {
     LOG(ERROR) << "Could not initialize login database.";
     delete login_db;
     return NULL;
   }
 #if defined(OS_WIN)
   ps = new PasswordStoreWin(
       login_db, profile,
-      profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
+      WebDataServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS));
 #elif defined(OS_MACOSX)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseMockKeychain)) {
     ps = new PasswordStoreMac(new crypto::MockKeychain(), login_db);
   } else {
     ps = new PasswordStoreMac(new crypto::MacKeychain(), login_db);
   }
 #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));
+  ps = new PasswordStoreDefault(login_db, profile,
+      WebDataServiceFactory::GetForProfile(profile, 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 34 matching lines @@
 #endif  // defined(USE_GNOME_KEYRING)
   }
 
   if (!backend.get()) {
     LOG(WARNING) << "Using basic (unencrypted) store for password storage. "
         "See http://code.google.com/p/chromium/wiki/LinuxPasswordStorage for "
         "more information about password storage options.";
   }
 
   ps = new PasswordStoreX(login_db, profile,
-                          profile->GetWebDataService(Profile::IMPLICIT_ACCESS),
+                          WebDataServiceFactory::GetForProfile(profile,
+                              Profile::IMPLICIT_ACCESS),
                           backend.release());
 #else
   NOTIMPLEMENTED();
 #endif
   if (!ps)
     delete login_db;
 
   if (!ps || !ps->Init()) {
     NOTREACHED() << "Could not initialize password manager.";
     return NULL;
@@ skipping 15 matching lines @@
 #endif
 }
 
 bool PasswordStoreFactory::ServiceRedirectedInIncognito() {
   return true;
 }
 
 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() {
   return true;
 }