Prevent ScopedTempDir cleanup issues in ProfileWriterTest

Bug: 546640
Change-Id: I9149fdcfba9140a3c6665e058b8439db3d6fa2c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1978039
Commit-Queue: Oliver Li <olivierli@chromium.org>
Auto-Submit: Oliver Li <olivierli@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726973}

chrome/browser/importer/profile_writer_unittest.cc

@@ -45,6 +45,22 @@ class ProfileWriterTest : public testing::Test {
   ProfileWriterTest() {}
   ~ProfileWriterTest() override {}
 
+  void SetUp() override {
+    DCHECK(profile_dir_.CreateUniqueTempDir());
+    TestingProfile::Builder profile_builder;
+    profile_builder.SetPath(profile_dir_.GetPath());
+    profile_ = profile_builder.Build();
+
+    DCHECK(second_profile_dir_.CreateUniqueTempDir());
+    TestingProfile::Builder second_profile_builder;
+    second_profile_builder.SetPath(second_profile_dir_.GetPath());
+    second_profile_ = second_profile_builder.Build();
+  }
+
+  TestingProfile* profile() { return profile_.get(); }
+
+  TestingProfile* second_profile() { return second_profile_.get(); }
+
   // Create test bookmark entries to be added to ProfileWriter to
   // simulate bookmark importing.
   void CreateImportedBookmarksEntries() {
@@ -133,31 +149,39 @@ class ProfileWriterTest : public testing::Test {
     bookmarks_.push_back(entry);
   }
 
+  // Profile directories that outlive |task_environment_| are needed because
+  // CreateHistoryService/CreateBookmarkModel use the directory to host
+  // databases. See https://crbug.com/546640 for more details.
+  base::ScopedTempDir profile_dir_;
+  base::ScopedTempDir second_profile_dir_;
+
   content::BrowserTaskEnvironment task_environment_;
 
+  std::unique_ptr<TestingProfile> profile_;
+  std::unique_ptr<TestingProfile> second_profile_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileWriterTest);
 };
 
 // Add bookmarks via ProfileWriter to profile1 when profile2 also exists.
 TEST_F(ProfileWriterTest, CheckBookmarksWithMultiProfile) {
-  TestingProfile profile2;
-  profile2.CreateBookmarkModel(true);
+  second_profile()->CreateBookmarkModel(true);
 
   BookmarkModel* bookmark_model2 =
-      BookmarkModelFactory::GetForBrowserContext(&profile2);
+      BookmarkModelFactory::GetForBrowserContext(second_profile());
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model2);
   bookmarks::AddIfNotBookmarked(
       bookmark_model2, GURL("http://www.bing.com"), base::ASCIIToUTF16("Bing"));
-  TestingProfile profile1;
-  profile1.CreateBookmarkModel(true);
+
+  profile()->CreateBookmarkModel(true);
 
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model1 =
-      BookmarkModelFactory::GetForBrowserContext(&profile1);
+      BookmarkModelFactory::GetForBrowserContext(profile());
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model1);
 
   scoped_refptr<TestProfileWriter> profile_writer(
-      new TestProfileWriter(&profile1));
+      new TestProfileWriter(profile()));
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
 
@@ -172,16 +196,15 @@ TEST_F(ProfileWriterTest, CheckBookmarksWithMultiProfile) {
 
 // Verify that bookmarks are duplicated when added twice.
 TEST_F(ProfileWriterTest, CheckBookmarksAfterWritingDataTwice) {
-  TestingProfile profile;
-  profile.CreateBookmarkModel(true);
+  profile()->CreateBookmarkModel(true);
 
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model =
-      BookmarkModelFactory::GetForBrowserContext(&profile);
+      BookmarkModelFactory::GetForBrowserContext(profile());
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
 
   scoped_refptr<TestProfileWriter> profile_writer(
-      new TestProfileWriter(&profile));
+      new TestProfileWriter(profile()));
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
   std::vector<UrlAndTitle> bookmarks_record;
@@ -209,28 +232,26 @@ std::unique_ptr<TemplateURL> ProfileWriterTest::CreateTemplateURL(
 
 // Verify that history entires are not duplicated when added twice.
 TEST_F(ProfileWriterTest, CheckHistoryAfterWritingDataTwice) {
-  TestingProfile profile;
-  ASSERT_TRUE(profile.CreateHistoryService(true, false));
-  profile.BlockUntilHistoryProcessesPendingRequests();
+  ASSERT_TRUE(profile()->CreateHistoryService(true, false));
+  profile()->BlockUntilHistoryProcessesPendingRequests();
 
   CreateHistoryPageEntries();
   scoped_refptr<TestProfileWriter> profile_writer(
-      new TestProfileWriter(&profile));
+      new TestProfileWriter(profile()));
   profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
-  VerifyHistoryCount(&profile);
+  VerifyHistoryCount(profile());
   size_t original_history_count = history_count_;
   history_count_ = 0;
 
   profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
-  VerifyHistoryCount(&profile);
+  VerifyHistoryCount(profile());
   EXPECT_EQ(original_history_count, history_count_);
 }
 
 TEST_F(ProfileWriterTest, AddKeywords) {
-  TestingProfile profile;
-  ASSERT_TRUE(profile.CreateHistoryService(true, false));
+  ASSERT_TRUE(profile()->CreateHistoryService(true, false));
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
-      &profile,
+      profile(),
       base::BindRepeating(&TemplateURLServiceFactory::BuildInstanceFor));
 
   TemplateURLService::OwnedTemplateURLVector keywords;
@@ -242,11 +263,11 @@ TEST_F(ProfileWriterTest, AddKeywords) {
   // This entry will not be added since the keyword contains spaces.
   keywords.push_back(CreateTemplateURL("key 3", "http://key3.com", "n3"));
 
-  auto profile_writer = base::MakeRefCounted<TestProfileWriter>(&profile);
+  auto profile_writer = base::MakeRefCounted<TestProfileWriter>(profile());
   profile_writer->AddKeywords(std::move(keywords), false);
 
   TemplateURLService* turl_model =
-      TemplateURLServiceFactory::GetForProfile(&profile);
+      TemplateURLServiceFactory::GetForProfile(profile());
   auto turls = turl_model->GetTemplateURLs();
   EXPECT_EQ(turls.size(), 2u);