Profile refactoring: Remove all PasswordStore code from the Profile interface.

chrome/browser/password_manager/password_store.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
 #pragma once
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "chrome/browser/cancelable_request.h"
+#include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 
 class PasswordStore;
 class PasswordStoreConsumer;
 class Task;
 
 namespace browser_sync {
 class PasswordDataTypeController;
 class PasswordModelAssociator;
 class PasswordModelWorker;
 }
 
 namespace webkit {
 namespace forms {
 struct PasswordForm;
 }
 }
 
 namespace passwords_helper {
 void AddLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
 void RemoveLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
 void UpdateLogin(PasswordStore* store, const webkit::forms::PasswordForm& form);
 }
 
 // Interface for storing form passwords in a platform-specific secure way.
 // The login request/manipulation API is not threadsafe and must be used
 // from the UI thread.
 class PasswordStore
-    : public base::RefCountedThreadSafe<PasswordStore>,
+    : public RefcountedProfileKeyedService,
       public CancelableRequestProvider {
  public:
   typedef base::Callback<
       void(Handle, const std::vector<webkit::forms::PasswordForm*>&)>
       GetLoginsCallback;
 
   // PasswordForm vector elements are meant to be owned by the
   // PasswordStoreConsumer. However, if the request is canceled after the
   // allocation, then the request must take care of the deletion.
   // TODO(scr) If we can convert vector<PasswordForm*> to
@@ skipping 22 matching lines @@
 
    protected:
     virtual ~Observer() {}
   };
 
   PasswordStore();
 
   // Reimplement this to add custom initialization. Always call this too.
   virtual bool Init();
 
-  // Invoked from the profiles destructor to shutdown the PasswordStore.
-  virtual void Shutdown();
-
   // Adds the given PasswordForm to the secure password store asynchronously.
   virtual void AddLogin(const webkit::forms::PasswordForm& form);
 
   // Updates the matching PasswordForm in the secure password store (async).
   void UpdateLogin(const webkit::forms::PasswordForm& form);
 
   // Removes the matching PasswordForm from the secure password store (async).
   void RemoveLogin(const webkit::forms::PasswordForm& form);
 
   // Removes all logins created in the given date range.
@@ skipping 112 matching lines @@
   // may have been changed.
   void NotifyLoginsChanged();
 
   // The observers.
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStore);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_