Passwords: Remove references to BrowserThread from PasswordStore.

chrome/browser/password_manager/password_store_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
@@ skipping 18 matching lines @@
 using testing::WithArg;
 
 namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
   MOCK_METHOD1(OnGetPasswordStoreResults,
                void(const std::vector<PasswordForm*>&));
 };
 
-// This class will add and remove a mock notification observer from
-// the DB thread.
-class DBThreadObserverHelper
-    : public base::RefCountedThreadSafe<DBThreadObserverHelper,
-                                        BrowserThread::DeleteOnDBThread> {
- public:
-  DBThreadObserverHelper() : done_event_(true, false) {}
-
-  void Init(PasswordStore* password_store) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    BrowserThread::PostTask(
-        BrowserThread::DB,
-        FROM_HERE,
-        base::Bind(&DBThreadObserverHelper::AddObserverTask,
-                   this,
-                   make_scoped_refptr(password_store)));
-    done_event_.Wait();
-  }
-
-  content::MockNotificationObserver& observer() {
-    return observer_;
-  }
-
- protected:
-  virtual ~DBThreadObserverHelper() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-    registrar_.RemoveAll();
-  }
-
-  void AddObserverTask(PasswordStore* password_store) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-    registrar_.Add(&observer_,
-                   chrome::NOTIFICATION_LOGINS_CHANGED,
-                   content::Source<PasswordStore>(password_store));
-    done_event_.Signal();
-  }
-
-  WaitableEvent done_event_;
-  content::NotificationRegistrar registrar_;
-  content::MockNotificationObserver observer_;
-
- private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::DB>;
-  friend class base::DeleteHelper<DBThreadObserverHelper>;
-};
-
 }  // anonymous namespace
 
 class PasswordStoreTest : public testing::Test {
  protected:
   PasswordStoreTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {
   }
 
   virtual void SetUp() {
@@ skipping 26 matching lines @@
   STLDeleteContainerPointers(arg0.begin(), arg0.end());
 }
 
 ACTION(QuitUIMessageLoop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::MessageLoop::current()->Quit();
 }
 
 TEST_F(PasswordStoreTest, IgnoreOldWwwGoogleLogins) {
   scoped_refptr<PasswordStoreDefault> store(
-      new PasswordStoreDefault(login_db_.release(), profile_.get()));
+      new PasswordStoreDefault(
+          base::MessageLoopProxy::current(),
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+          login_db_.release(),
+          profile_.get()));
   store->Init();
 
   const time_t cutoff = 1325376000;  // 00:00 Jan 1 2012 UTC
   // The passwords are all empty because PasswordStoreDefault doesn't store the
   // actual passwords on OS X (they're stored in the Keychain instead). We could
   // special-case it, but it's easier to just have empty passwords.
   static const PasswordFormData form_data[] = {
     // A form on https://www.google.com/ older than the cutoff. Will be ignored.
     { PasswordForm::SCHEME_HTML,
       "https://www.google.com",
@@ skipping 115 matching lines @@
       .WillOnce(WithArg<0>(STLDeleteElements0())).RetiresOnSaturation();
 
   store->GetLogins(www_google, PasswordStore::ALLOW_PROMPT, &consumer);
   store->GetLogins(accounts_google, PasswordStore::ALLOW_PROMPT, &consumer);
   store->GetLogins(bar_example, PasswordStore::ALLOW_PROMPT, &consumer);
 
   base::MessageLoop::current()->Run();
 
   STLDeleteElements(&all_forms);
 }