Open the LoginDatabase on the DB thread, not the UI thread.

chrome/browser/password_manager/password_store_x_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/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/pref_service.h"
@@ skipping 221 matching lines @@
 enum BackendType {
   NO_BACKEND,
   FAILING_BACKEND,
   WORKING_BACKEND
 };
 
 class PasswordStoreXTest : public testing::TestWithParam<BackendType> {
  protected:
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-
-    login_db_.reset(new password_manager::LoginDatabase());
-    ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append("login_test")));
   }
 
   void TearDown() override { base::RunLoop().RunUntilIdle(); }
 
+  base::FilePath test_login_db_file_path() const {
+    return temp_dir_.path().Append(FILE_PATH_LITERAL("login_test"));
+  }
+
   PasswordStoreX::NativeBackend* GetBackend() {
     switch (GetParam()) {
       case FAILING_BACKEND:
         return new FailingBackend();
       case WORKING_BACKEND:
         return new MockBackend();
       default:
         return NULL;
     }
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
 
-  scoped_ptr<password_manager::LoginDatabase> login_db_;
   base::ScopedTempDir temp_dir_;
 };
 
 ACTION(STLDeleteElements0) {
   STLDeleteContainerPointers(arg0.begin(), arg0.end());
 }
 
 TEST_P(PasswordStoreXTest, Notifications) {
-  scoped_refptr<PasswordStoreX> store(
-      new PasswordStoreX(base::MessageLoopProxy::current(),
-                         base::MessageLoopProxy::current(),
-                         login_db_.release(),
-                         GetBackend()));
+  scoped_ptr<password_manager::LoginDatabase> login_db(
+      new password_manager::LoginDatabase(test_login_db_file_path()));
+  scoped_refptr<PasswordStoreX> store(new PasswordStoreX(
+      base::MessageLoopProxy::current(), base::MessageLoopProxy::current(),
+      login_db.Pass(), GetBackend()));
   store->Init(syncer::SyncableService::StartSyncFlare());
 
   password_manager::PasswordFormData form_data = {
       PasswordForm::SCHEME_HTML,       "http://bar.example.com",
       "http://bar.example.com/origin", "http://bar.example.com/action",
       L"submit_element",               L"username_element",
       L"password_element",             L"username_value",
       L"password_value",               true,
       false,                           1};
   scoped_ptr<PasswordForm> form(CreatePasswordFormFromData(form_data));
@@ skipping 52 matching lines @@
   store->Shutdown();
 }
 
 TEST_P(PasswordStoreXTest, NativeMigration) {
   VectorOfForms expected_autofillable;
   InitExpectedForms(true, 50, &expected_autofillable);
 
   VectorOfForms expected_blacklisted;
   InitExpectedForms(false, 50, &expected_blacklisted);
 
+  const base::FilePath login_db_file = test_login_db_file_path();
+  scoped_ptr<password_manager::LoginDatabase> login_db(
+      new password_manager::LoginDatabase(login_db_file));
+  ASSERT_TRUE(login_db->Init());
+
   // Get the initial size of the login DB file, before we populate it.
   // This will be used later to make sure it gets back to this size.
-  const base::FilePath login_db_file = temp_dir_.path().Append("login_test");
   base::File::Info db_file_start_info;
   ASSERT_TRUE(base::GetFileInfo(login_db_file, &db_file_start_info));
 
-  password_manager::LoginDatabase* login_db = login_db_.get();
-
   // Populate the login DB with logins that should be migrated.
   for (VectorOfForms::iterator it = expected_autofillable.begin();
        it != expected_autofillable.end(); ++it) {
     login_db->AddLogin(**it);
   }
   for (VectorOfForms::iterator it = expected_blacklisted.begin();
        it != expected_blacklisted.end(); ++it) {
     login_db->AddLogin(**it);
   }
 
   // Get the new size of the login DB file. We expect it to be larger.
   base::File::Info db_file_full_info;
   ASSERT_TRUE(base::GetFileInfo(login_db_file, &db_file_full_info));
   EXPECT_GT(db_file_full_info.size, db_file_start_info.size);
 
   // Initializing the PasswordStore shouldn't trigger a native migration (yet).
-  scoped_refptr<PasswordStoreX> store(
-      new PasswordStoreX(base::MessageLoopProxy::current(),
-                         base::MessageLoopProxy::current(),
-                         login_db_.release(),
-                         GetBackend()));
+  login_db.reset(new password_manager::LoginDatabase(login_db_file));
+  scoped_refptr<PasswordStoreX> store(new PasswordStoreX(
+      base::MessageLoopProxy::current(), base::MessageLoopProxy::current(),
+      login_db.Pass(), GetBackend()));
   store->Init(syncer::SyncableService::StartSyncFlare());
 
   MockPasswordStoreConsumer consumer;
 
   // The autofillable forms should have been migrated to the native backend.
   EXPECT_CALL(consumer,
       OnGetPasswordStoreResults(
           ContainsAllPasswordForms(expected_autofillable)))
       .WillOnce(WithArg<0>(STLDeleteElements0()));
 
@@ skipping 16 matching lines @@
     EXPECT_CALL(ld_return,
                 OnLoginDatabaseQueryDone(ContainsAllPasswordForms(empty)));
   } else {
     // The autofillable logins should still be in the login DB.
     EXPECT_CALL(ld_return,
                 OnLoginDatabaseQueryDone(
                     ContainsAllPasswordForms(expected_autofillable)))
         .WillOnce(WithArg<0>(STLDeleteElements0()));
   }
 
-  LoginDatabaseQueryCallback(login_db, true, &ld_return);
+  LoginDatabaseQueryCallback(store->login_db(), true, &ld_return);
 
   // Wait for the login DB methods to execute.
   base::RunLoop().RunUntilIdle();
 
   if (GetParam() == WORKING_BACKEND) {
     // Likewise, no blacklisted logins should be left in the login DB.
     EXPECT_CALL(ld_return,
                 OnLoginDatabaseQueryDone(ContainsAllPasswordForms(empty)));
   } else {
     // The blacklisted logins should still be in the login DB.
     EXPECT_CALL(ld_return,
                 OnLoginDatabaseQueryDone(
                     ContainsAllPasswordForms(expected_blacklisted)))
         .WillOnce(WithArg<0>(STLDeleteElements0()));
   }
 
-  LoginDatabaseQueryCallback(login_db, false, &ld_return);
+  LoginDatabaseQueryCallback(store->login_db(), false, &ld_return);
 
   // Wait for the login DB methods to execute.
   base::RunLoop().RunUntilIdle();
 
   if (GetParam() == WORKING_BACKEND) {
     // If the migration succeeded, then not only should there be no logins left
     // in the login DB, but also the file should have been deleted and then
     // recreated. We approximate checking for this by checking that the file
     // size is equal to the size before we populated it, even though it was
     // larger after populating it.
@@ skipping 10 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));