Create BrowsingDataRemoverBrowserTestBase to hold shared test code.

Bug: 1026442
Change-Id: I9b4ee82690ea45b85ac3094821b9a9ecc2ccb143
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2524504
Commit-Queue: Yann Dago <ydago@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Auto-Submit: Yann Dago <ydago@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825475}

chrome/browser/browsing_data/browsing_data_remover_browsertest.cc

@@ -23,6 +23,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_util.h"
+#include "chrome/browser/browsing_data/browsing_data_remover_browsertest_base.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/browsing_data/counters/cache_counter.h"
@@ -297,7 +298,8 @@ bool SetGaiaCookieForProfile(Profile* profile) {
 
 }  // namespace
 
-class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
+class BrowsingDataRemoverBrowserTest
+    : public BrowsingDataRemoverBrowserTestBase {
  public:
   BrowsingDataRemoverBrowserTest() {
     std::vector<base::Feature> enabled_features = {
@@ -305,70 +307,13 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
 #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
     enabled_features.push_back(media::kExternalClearKeyForTesting);
 #endif
-    feature_list_.InitWithFeatures(enabled_features, {});
-  }
-
-  // Call to use an Incognito browser rather than the default.
-  void UseIncognitoBrowser() {
-    ASSERT_EQ(nullptr, incognito_browser_);
-    incognito_browser_ = CreateIncognitoBrowser();
-  }
-
-  Browser* GetBrowser() const {
-    return incognito_browser_ ? incognito_browser_ : browser();
+    InitFeatureList(std::move(enabled_features));
   }
 
   void SetUpOnMainThread() override {
-    base::FilePath path;
-    base::PathService::Get(content::DIR_TEST_DATA, &path);
+    BrowsingDataRemoverBrowserTestBase::SetUpOnMainThread();
     host_resolver()->AddRule(kExampleHost, "127.0.0.1");
-    embedded_test_server()->ServeFilesFromDirectory(path);
-    ASSERT_TRUE(embedded_test_server()->Start());
-  }
-
-  void RunScriptAndCheckResult(const std::string& script,
-                               const std::string& result) {
-    std::string data;
-    ASSERT_TRUE(content::ExecuteScriptAndExtractString(
-        GetBrowser()->tab_strip_model()->GetActiveWebContents(), script,
-        &data));
-    ASSERT_EQ(data, result);
-  }
-
-  bool RunScriptAndGetBool(const std::string& script) {
-    bool data;
-    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-        GetBrowser()->tab_strip_model()->GetActiveWebContents(), script,
-        &data));
-    return data;
-  }
-
-  void VerifyDownloadCount(size_t expected) {
-    content::DownloadManager* download_manager =
-        content::BrowserContext::GetDownloadManager(GetBrowser()->profile());
-    std::vector<download::DownloadItem*> downloads;
-    download_manager->GetAllDownloads(&downloads);
-    EXPECT_EQ(expected, downloads.size());
-  }
-
-  void DownloadAnItem() {
-    // Start a download.
-    content::DownloadManager* download_manager =
-        content::BrowserContext::GetDownloadManager(GetBrowser()->profile());
-    std::unique_ptr<content::DownloadTestObserver> observer(
-        new content::DownloadTestObserverTerminal(
-            download_manager, 1,
-            content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
-
-    GURL download_url = ui_test_utils::GetTestUrl(
-        base::FilePath().AppendASCII("downloads"),
-        base::FilePath().AppendASCII("a_zip_file.zip"));
-    ui_test_utils::NavigateToURL(GetBrowser(), download_url);
-    observer->WaitForFinished();
-
-    VerifyDownloadCount(1u);
   }
-
   void RemoveAndWait(uint64_t remove_mask) {
     RemoveAndWait(remove_mask, base::Time(), base::Time::Max());
   }
@@ -449,28 +394,6 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
     ExpectCookieTreeModelCount(0);
   }
 
-  bool HasDataForType(const std::string& type) {
-    return RunScriptAndGetBool("has" + type + "()");
-  }
-
-  void SetDataForType(const std::string& type) {
-    ASSERT_TRUE(RunScriptAndGetBool("set" + type + "()"))
-        << "Couldn't create data for: " << type;
-  }
-
-  int GetSiteDataCount() {
-    base::RunLoop run_loop;
-    int count = -1;
-    (new SiteDataCountingHelper(GetBrowser()->profile(), base::Time(),
-                                base::Time::Max(),
-                                base::BindLambdaForTesting([&](int c) {
-                                  count = c;
-                                  run_loop.Quit();
-                                })))
-        ->CountAndDestroySelfWhenFinished();
-    run_loop.Run();
-    return count;
-  }
 
 #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
   int GetMediaLicenseCount() {
@@ -579,9 +502,6 @@ class BrowsingDataRemoverBrowserTest : public InProcessBrowserTest {
     RegisterClearKeyCdm(command_line);
 #endif
   }
-
-  base::test::ScopedFeatureList feature_list_;
-  Browser* incognito_browser_ = nullptr;
 };
 
 #if BUILDFLAG(ENABLE_DICE_SUPPORT)

chrome/browser/browsing_data/browsing_data_remover_browsertest_base.cc

+// Copyright (c) 2020 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 "chrome/browser/browsing_data/browsing_data_remover_browsertest_base.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "base/callback.h"
+#include "base/path_service.h"
+#include "base/test/bind.h"
+#include "chrome/browser/browsing_data/cookies_tree_model.h"
+#include "chrome/browser/browsing_data/counters/site_data_counting_helper.h"
+#include "chrome/browser/net/system_network_context_manager.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/download_manager.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/common/content_paths.h"
+#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/download_test_observer.h"
+#include "net/dns/mock_host_resolver.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "third_party/leveldatabase/leveldb_features.h"
+#include "ui/base/models/tree_model.h"
+
+namespace {
+
+// Class for waiting for download manager to be initiailized.
+class DownloadManagerWaiter : public content::DownloadManager::Observer {
+ public:
+  explicit DownloadManagerWaiter(content::DownloadManager* download_manager)
+      : initialized_(false), download_manager_(download_manager) {
+    download_manager_->AddObserver(this);
+  }
+
+  ~DownloadManagerWaiter() override { download_manager_->RemoveObserver(this); }
+
+  void WaitForInitialized() {
+    initialized_ = download_manager_->IsManagerInitialized();
+    if (initialized_)
+      return;
+    base::RunLoop run_loop;
+    quit_closure_ = run_loop.QuitClosure();
+    run_loop.Run();
+  }
+
+  void OnManagerInitialized() override {
+    initialized_ = true;
+    if (quit_closure_)
+      std::move(quit_closure_).Run();
+  }
+
+ private:
+  base::OnceClosure quit_closure_;
+  bool initialized_;
+  content::DownloadManager* download_manager_;
+};
+}  // namespace
+
+BrowsingDataRemoverBrowserTestBase::BrowsingDataRemoverBrowserTestBase() =
+    default;
+
+BrowsingDataRemoverBrowserTestBase::~BrowsingDataRemoverBrowserTestBase() =
+    default;
+
+void BrowsingDataRemoverBrowserTestBase::InitFeatureList(
+    std::vector<base::Feature> enabled_features) {
+  feature_list_.InitWithFeatures(enabled_features, {});
+}
+
+// Call to use an Incognito browser rather than the default.
+void BrowsingDataRemoverBrowserTestBase::UseIncognitoBrowser() {
+  ASSERT_EQ(nullptr, incognito_browser_);
+  incognito_browser_ = CreateIncognitoBrowser();
+}
+
+Browser* BrowsingDataRemoverBrowserTestBase::GetBrowser() const {
+  return incognito_browser_ ? incognito_browser_ : browser();
+}
+
+void BrowsingDataRemoverBrowserTestBase::SetUpOnMainThread() {
+  base::FilePath path;
+  base::PathService::Get(content::DIR_TEST_DATA, &path);
+  embedded_test_server()->ServeFilesFromDirectory(path);
+  ASSERT_TRUE(embedded_test_server()->Start());
+}
+
+void BrowsingDataRemoverBrowserTestBase::RunScriptAndCheckResult(
+    const std::string& script,
+    const std::string& result) {
+  std::string data;
+  ASSERT_TRUE(content::ExecuteScriptAndExtractString(
+      GetBrowser()->tab_strip_model()->GetActiveWebContents(), script, &data));
+  ASSERT_EQ(data, result);
+}
+
+bool BrowsingDataRemoverBrowserTestBase::RunScriptAndGetBool(
+    const std::string& script) {
+  bool data;
+  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+      GetBrowser()->tab_strip_model()->GetActiveWebContents(), script, &data));
+  return data;
+}
+
+void BrowsingDataRemoverBrowserTestBase::VerifyDownloadCount(size_t expected) {
+  content::DownloadManager* download_manager =
+      content::BrowserContext::GetDownloadManager(GetBrowser()->profile());
+  DownloadManagerWaiter download_manager_waiter(download_manager);
+  download_manager_waiter.WaitForInitialized();
+  std::vector<download::DownloadItem*> downloads;
+  download_manager->GetAllDownloads(&downloads);
+  EXPECT_EQ(expected, downloads.size());
+}
+
+void BrowsingDataRemoverBrowserTestBase::DownloadAnItem() {
+  // Start a download.
+  content::DownloadManager* download_manager =
+      content::BrowserContext::GetDownloadManager(GetBrowser()->profile());
+  std::unique_ptr<content::DownloadTestObserver> observer(
+      new content::DownloadTestObserverTerminal(
+          download_manager, 1,
+          content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
+
+  GURL download_url =
+      ui_test_utils::GetTestUrl(base::FilePath().AppendASCII("downloads"),
+                                base::FilePath().AppendASCII("a_zip_file.zip"));
+  ui_test_utils::NavigateToURL(GetBrowser(), download_url);
+  observer->WaitForFinished();
+
+  VerifyDownloadCount(1u);
+}
+
+bool BrowsingDataRemoverBrowserTestBase::HasDataForType(
+    const std::string& type) {
+  return RunScriptAndGetBool("has" + type + "()");
+}
+
+void BrowsingDataRemoverBrowserTestBase::SetDataForType(
+    const std::string& type) {
+  ASSERT_TRUE(RunScriptAndGetBool("set" + type + "()"))
+      << "Couldn't create data for: " << type;
+}
+
+int BrowsingDataRemoverBrowserTestBase::GetSiteDataCount() {
+  base::RunLoop run_loop;
+  int count = -1;
+  (new SiteDataCountingHelper(GetBrowser()->profile(), base::Time(),
+                              base::Time::Max(),
+                              base::BindLambdaForTesting([&](int c) {
+                                count = c;
+                                run_loop.Quit();
+                              })))
+      ->CountAndDestroySelfWhenFinished();
+  run_loop.Run();
+  return count;
+}
+
+network::mojom::NetworkContext*
+BrowsingDataRemoverBrowserTestBase::network_context() const {
+  return content::BrowserContext::GetDefaultStoragePartition(
+             GetBrowser()->profile())
+      ->GetNetworkContext();
+}

chrome/browser/browsing_data/browsing_data_remover_browsertest_base.h

+// Copyright (c) 2020 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_BROWSING_DATA_BROWSING_DATA_REMOVER_BROWSERTEST_BASE_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_BROWSERTEST_BASE_H_
+
+#include <string>
+#include "base/test/scoped_feature_list.h"
+#include "chrome/test/base/in_process_browser_test.h"
+
+class BrowsingDataRemoverBrowserTestBase : public InProcessBrowserTest {
+ public:
+  BrowsingDataRemoverBrowserTestBase();
+  ~BrowsingDataRemoverBrowserTestBase() override;
+
+  void InitFeatureList(std::vector<base::Feature> enabled_features);
+
+  Browser* GetBrowser() const;
+  void SetUpOnMainThread() override;
+  void RunScriptAndCheckResult(const std::string& script,
+                               const std::string& result);
+  bool RunScriptAndGetBool(const std::string& script);
+  void VerifyDownloadCount(size_t expected);
+  void DownloadAnItem();
+  bool HasDataForType(const std::string& type);
+
+  void SetDataForType(const std::string& type);
+  int GetSiteDataCount();
+
+  void UseIncognitoBrowser();
+  bool IsIncognito() { return incognito_browser_ != nullptr; }
+
+  network::mojom::NetworkContext* network_context() const;
+
+ private:
+  base::test::ScopedFeatureList feature_list_;
+  Browser* incognito_browser_ = nullptr;
+};
+
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_BROWSERTEST_BASE_H_

chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc

@@ -18,6 +18,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/autofill/autofill_uitest_util.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/browsing_data/browsing_data_remover_browsertest_base.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 #include "chrome/browser/browsing_data/counters/site_data_counting_helper.h"
@@ -50,94 +51,31 @@
 #include "storage/browser/quota/special_storage_policy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace {
 
-static const char* kExampleHost = "example.com";
 enum class BrowserType { Default, Incognito };
 
 }  // namespace
 
-// TODO(ydago) : Extract this into a base class shared with BrowsingDataRemover
-// browser tests.
 class ChromeBrowsingDataLifetimeManagerTest
-    : public InProcessBrowserTest,
+    : public BrowsingDataRemoverBrowserTestBase,
       public testing::WithParamInterface<BrowserType> {
  public:
   ChromeBrowsingDataLifetimeManagerTest() {
-    feature_list_.InitAndEnableFeature(
-        browsing_data::features::kEnableBrowsingDataLifetimeManager);
+    InitFeatureList(
+        {browsing_data::features::kEnableBrowsingDataLifetimeManager});
   }
+
   ~ChromeBrowsingDataLifetimeManagerTest() override = default;
 
   void SetUpOnMainThread() override {
-    base::FilePath path;
-    base::PathService::Get(content::DIR_TEST_DATA, &path);
-    host_resolver()->AddRule(kExampleHost, "127.0.0.1");
-    embedded_test_server()->ServeFilesFromDirectory(path);
-    ASSERT_TRUE(embedded_test_server()->Start());
+    BrowsingDataRemoverBrowserTestBase::SetUpOnMainThread();
     if (GetParam() == BrowserType::Incognito)
       UseIncognitoBrowser();
   }
 
-  bool RunScriptAndGetBool(const std::string& script) {
-    bool data;
-    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-        GetBrowser()->tab_strip_model()->GetActiveWebContents(), script,
-        &data));
-    return data;
-  }
-
-  void SetDataForType(const std::string& type) {
-    ASSERT_TRUE(RunScriptAndGetBool("set" + type + "()"))
-        << "Couldn't create data for: " << type;
-  }
-
-  bool HasDataForType(const std::string& type) {
-    return RunScriptAndGetBool("has" + type + "()");
-  }
-
-  void VerifyDownloadCount(size_t expected) {
-    content::DownloadManager* download_manager =
-        content::BrowserContext::GetDownloadManager(GetBrowser()->profile());
-    std::vector<download::DownloadItem*> downloads;
-    download_manager->GetAllDownloads(&downloads);
-    EXPECT_EQ(expected, downloads.size());
-  }
-
-  void DownloadAnItem() {
-    // Start a download.
-    content::DownloadManager* download_manager =
-        content::BrowserContext::GetDownloadManager(GetBrowser()->profile());
-    std::unique_ptr<content::DownloadTestObserver> observer(
-        new content::DownloadTestObserverTerminal(
-            download_manager, 1,
-            content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
-
-    GURL download_url = ui_test_utils::GetTestUrl(
-        base::FilePath().AppendASCII("downloads"),
-        base::FilePath().AppendASCII("a_zip_file.zip"));
-    ui_test_utils::NavigateToURL(GetBrowser(), download_url);
-    observer->WaitForFinished();
-  }
-
-  network::mojom::NetworkContext* network_context() const {
-    return content::BrowserContext::GetDefaultStoragePartition(
-               GetBrowser()->profile())
-        ->GetNetworkContext();
-  }
-
-  // Call to use an Incognito browser rather than the default.
-  void UseIncognitoBrowser() {
-    ASSERT_EQ(nullptr, incognito_browser_);
-    incognito_browser_ = CreateIncognitoBrowser();
-  }
-
-  bool IsIncognito() { return incognito_browser_ != nullptr; }
-
-  Browser* GetBrowser() const {
-    return incognito_browser_ ? incognito_browser_ : browser();
-  }
 
   void ApplyBrowsingDataLifetimeDeletion(base::StringPiece pref) {
     auto* browsing_data_lifetime_manager =
@@ -156,10 +94,6 @@ class ChromeBrowsingDataLifetimeManagerTest
 
     completion_observer.BlockUntilCompletion();
   }
-
- private:
-  Browser* incognito_browser_ = nullptr;
-  base::test::ScopedFeatureList feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_P(ChromeBrowsingDataLifetimeManagerTest,

chrome/test/BUILD.gn

@@ -972,6 +972,8 @@ if (!is_android) {
       "../browser/browser_encoding_browsertest.cc",
       "../browser/browsing_data/access_context_audit_browsertest.cc",
       "../browser/browsing_data/browsing_data_remover_browsertest.cc",
+      "../browser/browsing_data/browsing_data_remover_browsertest_base.cc",
+      "../browser/browsing_data/browsing_data_remover_browsertest_base.h",
       "../browser/browsing_data/chrome_browsing_data_lifetime_manager_browsertest.cc",
       "../browser/browsing_data/counters/autofill_counter_browsertest.cc",
       "../browser/browsing_data/counters/browsing_data_counter_utils_browsertest.cc",