Re-land the password store work from bug 8205, with changes that should fix b...

chrome/browser/profile.h

Index: chrome/browser/profile.h
===================================================================
--- chrome/browser/profile.h	(revision 17245)
+++ chrome/browser/profile.h	(working copy)
@@ -31,6 +31,7 @@
 class ExtensionsService;
 class HistoryService;
 class NavigationController;
+class PasswordStore;
 class PrefService;
 class SessionService;
 class SpellChecker;
@@ -157,6 +158,9 @@
   // the ServiceAccessType definition above.
   virtual WebDataService* GetWebDataService(ServiceAccessType access) = 0;
 
+  // Returns the PasswordStore for this profile. This is owned by the Profile.
+  virtual PasswordStore* GetPasswordStore(ServiceAccessType access) = 0;
+
   // Retrieves a pointer to the PrefService that manages the preferences
   // for this user profile.  The PrefService is lazily created the first
   // time that this method is called.
@@ -314,6 +318,7 @@
   virtual ExtensionProcessManager* GetExtensionProcessManager();
   virtual HistoryService* GetHistoryService(ServiceAccessType sat);
   virtual WebDataService* GetWebDataService(ServiceAccessType sat);
+  virtual PasswordStore* GetPasswordStore(ServiceAccessType sat);
   virtual PrefService* GetPrefs();
   virtual TemplateURLModel* GetTemplateURLModel();
   virtual TemplateURLFetcher* GetTemplateURLFetcher();
@@ -359,6 +364,8 @@
   void CreateWebDataService();
   FilePath GetPrefFilePath();
 
+  void CreatePasswordStore();
+
   void StopCreateSessionServiceTimer();
 
   void EnsureSessionServiceCreated() {
@@ -401,10 +408,12 @@
   scoped_refptr<DownloadManager> download_manager_;
   scoped_refptr<HistoryService> history_service_;
   scoped_refptr<WebDataService> web_data_service_;
+  scoped_refptr<PasswordStore> password_store_;
   scoped_refptr<SessionService> session_service_;
   scoped_refptr<BrowserThemeProvider> theme_provider_;
   bool history_service_created_;
   bool created_web_data_service_;
+  bool created_password_store_;
   bool created_download_manager_;
   bool created_theme_provider_;
   // Whether or not the last session exited cleanly. This is set only once.