Change MockBrowsingDataRemover to MockBrowsingDataRemoverDelegate

chrome/browser/chrome_content_browser_client_unittest.cc

 // Copyright 2013 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/chrome_content_browser_client.h"
 
 #include <list>
 #include <map>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
+#include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
-#include "chrome/browser/browsing_data/mock_browsing_data_remover.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/media_features.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/browser.h"
@@ skipping 297 matching lines @@
 
 }  // namespace content
 #endif  // !defined(OS_ANDROID)
 
 namespace {
 
 // Tests for ChromeContentBrowserClient::ClearSiteData().
 class ChromeContentBrowserClientClearSiteDataTest : public testing::Test {
  public:
   void SetUp() override {
-    BrowsingDataRemoverFactory::GetInstance()->SetTestingFactoryAndUse(
-        &profile_, &ChromeContentBrowserClientClearSiteDataTest::GetRemover);
+    BrowsingDataRemoverFactory::GetForBrowserContext(profile())
+        ->SetEmbedderDelegate(
+            base::MakeUnique<MockBrowsingDataRemoverDelegate>());
+    run_loop_.reset(new base::RunLoop());
   }
 
   content::BrowserContext* profile() { return &profile_; }
 
-  MockBrowsingDataRemover* remover() {
-    return static_cast<MockBrowsingDataRemover*>(
-        BrowsingDataRemoverFactory::GetForBrowserContext(&profile_));
+  MockBrowsingDataRemoverDelegate* delegate() {
+    return static_cast<MockBrowsingDataRemoverDelegate*>(
+        BrowsingDataRemoverFactory::GetForBrowserContext(profile())
+            ->GetEmbedderDelegate());
   }
 
-  void SetClearingFinished(bool finished) { finished_ = finished; }
+  void OnClearingFinished() { run_loop_->Quit(); }
 
-  bool IsClearingFinished() { return finished_; }
+  void WaitForClearingFinished() {
+    run_loop_->Run();
+    run_loop_.reset(new base::RunLoop());
+  }
 
  private:
-  static std::unique_ptr<KeyedService> GetRemover(
-      content::BrowserContext* context) {
-    return base::WrapUnique(new MockBrowsingDataRemover(context));
-  }
-
+  std::unique_ptr<base::RunLoop> run_loop_;
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
-  bool finished_;
 };
 
 // Tests that the parameters to ClearBrowsingData() are translated to
 // the correct BrowsingDataRemover::RemoveInternal() operation. The fourth
 // parameter, |filter_builder|, is tested in detail in the RegistrableDomains
 // test below.
 TEST_F(ChromeContentBrowserClientClearSiteDataTest, Parameters) {
   ChromeContentBrowserClient client;
 
   struct TestCase {
@@ skipping 42 matching lines @@
     // calls. In the latter case, the removal mask will be split into two
     // parts - one for the origin deletion and one for the registrable domain.
     const int domain_scoped_types =
         BrowsingDataRemover::DATA_TYPE_COOKIES |
         BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
         ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA;
     int registrable_domain_deletion_mask = test_case.mask & domain_scoped_types;
     int origin_deletion_mask = test_case.mask & ~domain_scoped_types;
 
     if (registrable_domain_deletion_mask) {
-      remover()->ExpectCallDontCareAboutFilterBuilder(
-          base::Time(), base::Time::Max(),
-          registrable_domain_deletion_mask, all_origin_types);
+      delegate()->ExpectCallDontCareAboutFilterBuilder(
+          base::Time(), base::Time::Max(), registrable_domain_deletion_mask,
+          all_origin_types);
     }
 
     if (origin_deletion_mask) {
-      remover()->ExpectCallDontCareAboutFilterBuilder(
-          base::Time(), base::Time::Max(),
-          origin_deletion_mask, all_origin_types);
+      delegate()->ExpectCallDontCareAboutFilterBuilder(
+          base::Time(), base::Time::Max(), origin_deletion_mask,
+          all_origin_types);
     }
 
-    SetClearingFinished(false);
     client.ClearSiteData(
         profile(), url::Origin(GURL("https://www.example.com")),
         test_case.cookies, test_case.storage, test_case.cache,
         base::Bind(
-            &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
-            base::Unretained(this), true));
-    EXPECT_TRUE(IsClearingFinished());
+            &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
+            base::Unretained(this)));
+    WaitForClearingFinished();
 
-    remover()->VerifyAndClearExpectations();
+    delegate()->VerifyAndClearExpectations();
   }
 }
 
 // Tests that ClearBrowsingData() called for an origin deletes cookies in the
 // scope of the registrable domain corresponding to that origin, while cache
 // is deleted for that exact origin.
 TEST_F(ChromeContentBrowserClientClearSiteDataTest, RegistrableDomains) {
   ChromeContentBrowserClient client;
 
   struct TestCase {
@@ skipping 34 matching lines @@
   };
 
   for (const TestCase& test_case : test_cases) {
     SCOPED_TRACE(test_case.origin);
 
     std::unique_ptr<BrowsingDataFilterBuilder>
         registrable_domain_filter_builder(BrowsingDataFilterBuilder::Create(
             BrowsingDataFilterBuilder::WHITELIST));
     registrable_domain_filter_builder->AddRegisterableDomain(test_case.domain);
 
-    remover()->ExpectCall(
+    delegate()->ExpectCall(
         base::Time(), base::Time::Max(),
         BrowsingDataRemover::DATA_TYPE_COOKIES |
             BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
             ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA,
         ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES,
-        std::move(registrable_domain_filter_builder));
+        *registrable_domain_filter_builder);
 
     std::unique_ptr<BrowsingDataFilterBuilder> origin_filter_builder(
         BrowsingDataFilterBuilder::Create(
             BrowsingDataFilterBuilder::WHITELIST));
     origin_filter_builder->AddOrigin(url::Origin(GURL(test_case.origin)));
 
-    remover()->ExpectCall(base::Time(), base::Time::Max(),
-                          BrowsingDataRemover::DATA_TYPE_CACHE,
-                          ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES,
-                          std::move(origin_filter_builder));
+    delegate()->ExpectCall(base::Time(), base::Time::Max(),
+                           BrowsingDataRemover::DATA_TYPE_CACHE,
+                           ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES,
+                           *origin_filter_builder);
 
-    SetClearingFinished(false);
     client.ClearSiteData(
         profile(), url::Origin(GURL(test_case.origin)), true /* cookies */,
         false /* storage */, true /* cache */,
         base::Bind(
-            &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
-            base::Unretained(this), true));
-    EXPECT_TRUE(IsClearingFinished());
+            &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
+            base::Unretained(this)));
+    WaitForClearingFinished();
 
-    remover()->VerifyAndClearExpectations();
+    delegate()->VerifyAndClearExpectations();
   }
 }
 
 // Tests that we always wait for all scheduled BrowsingDataRemover tasks and
 // that BrowsingDataRemoverObserver never leaks.
 TEST_F(ChromeContentBrowserClientClearSiteDataTest, Tasks) {
   ChromeContentBrowserClient client;
   url::Origin origin(GURL("https://www.example.com"));
 
   // No removal tasks.
-  SetClearingFinished(false);
   client.ClearSiteData(
       profile(), origin, false /* cookies */, false /* storage */,
       false /* cache */,
       base::Bind(
-          &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
-          base::Unretained(this), true));
-  EXPECT_TRUE(IsClearingFinished());
+          &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
+          base::Unretained(this)));
+  WaitForClearingFinished();
 
   // One removal task: deleting cookies with a domain filter.
-  SetClearingFinished(false);
   client.ClearSiteData(
       profile(), origin, true /* cookies */, false /* storage */,
       false /* cache */,
       base::Bind(
-          &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
-          base::Unretained(this), true));
-  EXPECT_TRUE(IsClearingFinished());
+          &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
+          base::Unretained(this)));
+  WaitForClearingFinished();
 
   // One removal task: deleting cache with a domain filter.
-  SetClearingFinished(false);
   client.ClearSiteData(
       profile(), origin, false /* cookies */, false /* storage */,
       true /* cache */,
       base::Bind(
-          &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
-          base::Unretained(this), true));
-  EXPECT_TRUE(IsClearingFinished());
+          &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
+          base::Unretained(this)));
+  WaitForClearingFinished();
 
   // Two removal tasks, with domain and origin filters respectively.
-  SetClearingFinished(false);
   client.ClearSiteData(
       profile(), origin, true /* cookies */, false /* storage */,
       true /* cache */,
       base::Bind(
-          &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
-          base::Unretained(this), true));
-  EXPECT_TRUE(IsClearingFinished());
+          &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
+          base::Unretained(this)));
+  WaitForClearingFinished();
 }
 
 }  // namespace