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

chrome/browser/webdata/web_data_service_factory.h

Index: chrome/browser/webdata/web_data_service_factory.h
diff --git a/chrome/browser/webdata/web_data_service_factory.h b/chrome/browser/webdata/web_data_service_factory.h
index ae3a38581cc30623ae528cb8d3f6ab1f97e3b906..80b40c1c0d13f8b5fff767214be9abe460689b36 100644
--- a/chrome/browser/webdata/web_data_service_factory.h
+++ b/chrome/browser/webdata/web_data_service_factory.h
@@ -15,7 +15,10 @@
 
 class KeywordWebDataService;
 class TokenWebData;
-class WebDataService;
+
+#if defined(OS_WIN)
+class PasswordWebDataService;
+#endif
 
 namespace autofill {
 class AutofillWebDataService;
@@ -38,17 +41,22 @@ class WebDataServiceWrapper : public KeyedService {
 
   virtual scoped_refptr<KeywordWebDataService> GetKeywordWebData();
 
-  virtual scoped_refptr<WebDataService> GetWebData();
-
   virtual scoped_refptr<TokenWebData> GetTokenWebData();
 
+#if defined(OS_WIN)
+  virtual scoped_refptr<PasswordWebDataService> GetPasswordWebData();
+#endif
+
  private:
   scoped_refptr<WebDatabaseService> web_database_;
 
   scoped_refptr<autofill::AutofillWebDataService> autofill_web_data_;
   scoped_refptr<KeywordWebDataService> keyword_web_data_;
   scoped_refptr<TokenWebData> token_web_data_;
-  scoped_refptr<WebDataService> web_data_;
+
+#if defined(OS_WIN)
+  scoped_refptr<PasswordWebDataService> password_web_data_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(WebDataServiceWrapper);
 };
@@ -72,13 +80,21 @@ class WebDataServiceFactory : public BrowserContextKeyedServiceFactory {
                                    Profile::ServiceAccessType access_type);
 
   // Returns the KeywordWebDataService associated with the |profile|.
-  static scoped_refptr<KeywordWebDataService>
-      GetKeywordWebDataForProfile(Profile* profile,
-                                  Profile::ServiceAccessType access_type);
+  static scoped_refptr<KeywordWebDataService> GetKeywordWebDataForProfile(
+      Profile* profile,
+      Profile::ServiceAccessType access_type);
 
   // Returns the TokenWebData associated with the |profile|.
-  static scoped_refptr<TokenWebData> GetTokenWebDataForProfile(Profile* profile,
+  static scoped_refptr<TokenWebData> GetTokenWebDataForProfile(
+      Profile* profile,
+      Profile::ServiceAccessType access_type);
+
+#if defined(OS_WIN)
+  // Returns the PasswordWebDataService associated with the |profile|.
+  static scoped_refptr<PasswordWebDataService> GetPasswordWebDataForProfile(
+      Profile* profile,
       Profile::ServiceAccessType access_type);
+#endif
 
   static WebDataServiceFactory* GetInstance();