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

chrome/browser/importer/profile_writer.cc

Index: chrome/browser/importer/profile_writer.cc
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index eb02768c21e850cf2591cba9e13ecc720c6c845b..612f97b2a2aa4935fde39d635ee0eedc5dac7d83 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -22,7 +22,6 @@
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/pref_names.h"
@@ -31,6 +30,11 @@
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/webdata/password_web_data_service_win.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
+#endif
+
 namespace {
 
 // Generates a unique folder name. If |folder_name| is not unique, then this
@@ -86,7 +90,8 @@ void ProfileWriter::AddPasswordForm(const autofill::PasswordForm& form) {
 
 #if defined(OS_WIN)
 void ProfileWriter::AddIE7PasswordInfo(const IE7PasswordInfo& info) {
-  WebDataService::FromBrowserContext(profile_)->AddIE7Login(info);
+  WebDataServiceFactory::GetPasswordWebDataForProfile(
+      profile_, Profile::EXPLICIT_ACCESS)->AddIE7Login(info);
 }
 #endif