Kill WebDataService, move (WIN only) Password code into separate class.

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 "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/sync/glue/sync_start_util.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 "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/os_crypt/os_crypt_switches.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_default.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/password_store_win.h"
+#include "chrome/browser/webdata/password_web_data_service_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/password_manager/password_store_mac.h"
 #include "crypto/apple_keychain.h"
 #include "crypto/mock_apple_keychain.h"
 #elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
 // Don't do anything. We're going to use the default store.
 #elif defined(USE_X11)
 #include "base/nix/xdg_util.h"
 #if defined(USE_GNOME_KEYRING)
 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
@@ skipping 104 matching lines @@
       base::MessageLoopProxy::current());
   scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::DB));
 
   scoped_refptr<PasswordStore> ps;
 #if defined(OS_WIN)
   ps = new PasswordStoreWin(main_thread_runner,
                             db_thread_runner,
                             login_db.release(),
-                            WebDataService::FromBrowserContext(profile));
+                            WebDataServiceFactory::GetPasswordWebDataForProfile(
+                                profile, Profile::EXPLICIT_ACCESS));
 #elif defined(OS_MACOSX)
   crypto::AppleKeychain* keychain =
       CommandLine::ForCurrentProcess()->HasSwitch(
           os_crypt::switches::kUseMockKeychain) ?
           new crypto::MockAppleKeychain() : new crypto::AppleKeychain();
   ps = new PasswordStoreMac(
       main_thread_runner, db_thread_runner, keychain, login_db.release());
 #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.
@@ skipping 85 matching lines @@
 }
 
 content::BrowserContext* PasswordStoreFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }