| Index: chrome/browser/password_manager/credential_manager_browsertest.cc
|
| diff --git a/chrome/browser/password_manager/credential_manager_browsertest.cc b/chrome/browser/password_manager/credential_manager_browsertest.cc
|
| index d10b36344e380c873e3e1f0edb969adfaf624507..be572bbd405a557cfe5b302798f561fdf8220a13 100644
|
| --- a/chrome/browser/password_manager/credential_manager_browsertest.cc
|
| +++ b/chrome/browser/password_manager/credential_manager_browsertest.cc
|
| @@ -13,7 +13,6 @@
|
| #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "components/password_manager/core/browser/password_bubble_experiment.h"
|
| -#include "components/password_manager/core/browser/password_store_consumer.h"
|
| #include "components/password_manager/core/browser/test_password_store.h"
|
| #include "content/public/test/browser_test.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| @@ -23,28 +22,6 @@
|
|
|
| namespace {
|
|
|
| -// A helper class that synchronously waits until the password store handles a
|
| -// GetLogins() request.
|
| -class PasswordStoreResultsObserver
|
| - : public password_manager::PasswordStoreConsumer {
|
| - public:
|
| - PasswordStoreResultsObserver() = default;
|
| -
|
| - void OnGetPasswordStoreResults(
|
| - std::vector<std::unique_ptr<autofill::PasswordForm>> results) override {
|
| - run_loop_.Quit();
|
| - }
|
| -
|
| - void Wait() {
|
| - run_loop_.Run();
|
| - }
|
| -
|
| - private:
|
| - base::RunLoop run_loop_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(PasswordStoreResultsObserver);
|
| -};
|
| -
|
| class CredentialManagerBrowserTest : public PasswordManagerBrowserTestBase {
|
| public:
|
| CredentialManagerBrowserTest() = default;
|
| @@ -54,17 +31,6 @@ class CredentialManagerBrowserTest : public PasswordManagerBrowserTestBase {
|
| GetState() == password_manager::ui::CREDENTIAL_REQUEST_STATE;
|
| }
|
|
|
| - // Make sure that the password store processed all the previous calls which
|
| - // are executed on another thread.
|
| - void WaitForPasswordStore() {
|
| - scoped_refptr<password_manager::PasswordStore> password_store =
|
| - PasswordStoreFactory::GetForProfile(
|
| - browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS);
|
| - PasswordStoreResultsObserver syncer;
|
| - password_store->GetAutofillableLoginsWithAffiliatedRealms(&syncer);
|
| - syncer.Wait();
|
| - }
|
| -
|
| // Similarly to PasswordManagerBrowserTestBase::NavigateToFile this is a
|
| // wrapper around ui_test_utils::NavigateURL that waits until DidFinishLoad()
|
| // fires. Different to NavigateToFile this method allows passing a test_server
|
|
|