Passwords: Remove references to BrowserThread from PasswordStore.

chrome/browser/password_manager/password_store.h

 // Copyright (c) 2012 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_
 
 #include <vector>
 
 #include "base/callback.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h"
 
 class PasswordStore;
@@ skipping 75 matching lines @@
   // PasswordStore::SetObserver.
   class Observer {
    public:
     // Notifies the observer that password data changed in some way.
     virtual void OnLoginsChanged() = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
-  PasswordStore();
+  PasswordStore(
+      scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner);
 
   // Reimplement this to add custom initialization. Always call this too.
   virtual bool Init();
 
   // Adds the given PasswordForm to the secure password store asynchronously.
   virtual void AddLogin(const autofill::PasswordForm& form);
 
   // Updates the matching PasswordForm in the secure password store (async).
   void UpdateLogin(const autofill::PasswordForm& form);
 
@@ skipping 45 matching lines @@
   friend class browser_sync::PasswordDataTypeController;
   friend class browser_sync::PasswordModelAssociator;
   friend class browser_sync::PasswordModelWorker;
   friend class PasswordSyncableService;
   friend void passwords_helper::AddLogin(PasswordStore*,
                                          const autofill::PasswordForm&);
   friend void passwords_helper::RemoveLogin(PasswordStore*,
                                             const autofill::PasswordForm&);
   friend void passwords_helper::UpdateLogin(PasswordStore*,
                                             const autofill::PasswordForm&);
+  FRIEND_TEST_ALL_PREFIXES(PasswordStoreTest, IgnoreOldWwwGoogleLogins);
 
   virtual ~PasswordStore();
 
   // Schedules the given |task| to be run on the PasswordStore's TaskRunner.
   bool ScheduleTask(const base::Closure& task);
 
-  // Get the TaskRunner to use for PasswordStore tasks.
+  // Get the TaskRunner to use for PasswordStore background tasks.
   // By default, a SingleThreadTaskRunner on the DB thread is used, but
   // subclasses can override.
-  virtual scoped_refptr<base::SequencedTaskRunner> GetTaskRunner();
+  virtual scoped_refptr<base::SequencedTaskRunner> GetBackgroundTaskRunner();
 
   // These will be run in PasswordStore's own thread.
   // Synchronous implementation that reports usage metrics.
   virtual void ReportMetricsImpl() = 0;
   // Synchronous implementation to add the given login.
   virtual void AddLoginImpl(const autofill::PasswordForm& form) = 0;
   // Synchronous implementation to update the given login.
   virtual void UpdateLoginImpl(const autofill::PasswordForm& form) = 0;
   // Synchronous implementation to remove the given login.
   virtual void RemoveLoginImpl(const autofill::PasswordForm& form) = 0;
@@ skipping 26 matching lines @@
   virtual bool FillBlacklistLogins(
       std::vector<autofill::PasswordForm*>* forms) = 0;
 
   // Dispatches the result to the PasswordStoreConsumer on the original caller's
   // thread so the callback can be executed there. This should be the UI thread.
   virtual void ForwardLoginsResult(GetLoginsRequest* request);
 
   // Log UMA stats for number of bulk deletions.
   void LogStatsForBulkDeletion(int num_deletions);
 
+  // TaskRunner for tasks that run on the main thread (usually the UI thread).
+  scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner_;
+
+  // TaskRunner for the DB thread. By default, this is the task runner used for
+  // background tasks -- see |GetBackgroundTaskRunner|.
+  scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner_;
+
  private:
   // Schedule the given |func| to be run in the PasswordStore's own thread with
   // responses delivered to |consumer| on the current thread.
   template<typename BackendFunc>
   void Schedule(BackendFunc func, PasswordStoreConsumer* consumer);
 
   // Wrapper method called on the destination thread (DB for non-mac) that
   // invokes |task| and then calls back into the source thread to notify
   // observers that the password store may have been modified via
   // NotifyLoginsChanged(). Note that there is no guarantee that the called
@@ skipping 19 matching lines @@
       PasswordStore::GetLoginsRequest* request,
       const std::vector<autofill::PasswordForm*>& matched_forms);
 
   // The observers.
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStore);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_