Revert the password manager refactoring -- it failed reliability tests.

chrome/browser/profile.h

 // Copyright (c) 2006-2008 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILE_H_
 #define CHROME_BROWSER_PROFILE_H_
 
 #include <set>
@@ skipping 13 matching lines @@
 class ForceTLSState;
 }
 class BookmarkModel;
 class ChromeURLRequestContext;
 class DownloadManager;
 class Extension;
 class ExtensionProcessManager;
 class ExtensionsService;
 class HistoryService;
 class NavigationController;
-class PasswordStore;
 class PrefService;
 class SessionService;
 class SpellChecker;
 class SSLHostState;
 class SQLitePersistentCookieStore;
 class TabRestoreService;
 class TemplateURLFetcher;
 class TemplateURLModel;
 class BrowserThemeProvider;
 class URLRequestContext;
@@ skipping 106 matching lines @@
   virtual HistoryService* GetHistoryService(ServiceAccessType access) = 0;
 
   // Returns the WebDataService for this profile. This is owned by
   // the Profile. Callers that outlive the life of this profile need to be
   // sure they refcount the returned value.
   //
   // |access| defines what the caller plans to do with the service. See
   // 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.
   virtual PrefService* GetPrefs() = 0;
 
   // Returns the TemplateURLModel for this profile. This is owned by the
   // the Profile.
   virtual TemplateURLModel* GetTemplateURLModel() = 0;
 
   // Returns the TemplateURLFetcher for this profile. This is owned by the
@@ skipping 137 matching lines @@
   virtual void DestroyOffTheRecordProfile();
   virtual Profile* GetOriginalProfile();
   virtual VisitedLinkMaster* GetVisitedLinkMaster();
   virtual UserScriptMaster* GetUserScriptMaster();
   virtual SSLHostState* GetSSLHostState();
   virtual net::ForceTLSState* GetForceTLSState();
   virtual ExtensionsService* GetExtensionsService();
   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();
   virtual DownloadManager* GetDownloadManager();
   virtual void InitThemes();
   virtual void SetTheme(Extension* extension);
   virtual void ClearTheme();
   virtual ThemeProvider* GetThemeProvider();
   virtual bool HasCreatedDownloadManager() const;
   virtual URLRequestContext* GetRequestContext();
@@ skipping 25 matching lines @@
                        const NotificationDetails& details);
 
  private:
   friend class Profile;
 
   explicit ProfileImpl(const FilePath& path);
 
   void CreateWebDataService();
   FilePath GetPrefFilePath();
 
-  void CreatePasswordStore();
-
   void StopCreateSessionServiceTimer();
 
   void EnsureSessionServiceCreated() {
     GetSessionService();
   }
 
   // Initializes the spellchecker. If the spellchecker already exsts, then
   // it is released, and initialized again. This model makes sure that
   // spellchecker language can be changed without restarting the browser.
   // NOTE: This is being currently called in the UI thread, which is OK as long
@@ skipping 22 matching lines @@
 
   ChromeURLRequestContext* request_context_;
 
   ChromeURLRequestContext* media_request_context_;
 
   ChromeURLRequestContext* extensions_request_context_;
 
   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.
   bool last_session_exited_cleanly_;
 
   base::OneShotTimer<ProfileImpl> create_session_service_timer_;
 
   scoped_ptr<OffTheRecordProfileImpl> off_the_record_profile_;
 
   // See GetStartTime for details.
@@ skipping 26 matching lines @@
 #endif
 
 // This struct is used to pass the spellchecker object through the notification
 // NOTIFY_SPELLCHECKER_REINITIALIZED. This is used as the details for the
 // notification service.
 struct SpellcheckerReinitializedDetails {
   scoped_refptr<SpellChecker> spellchecker;
 };
 
 #endif  // CHROME_BROWSER_PROFILE_H_