Move BrowsingDataRemover to content/

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_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/browsing_data_remover.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"
@@ skipping 300 matching lines @@
 
 }  // namespace content
 #endif  // !defined(OS_ANDROID)
 
 namespace {
 
 // Tests for ChromeContentBrowserClient::ClearSiteData().
 class ChromeContentBrowserClientClearSiteDataTest : public testing::Test {
  public:
   void SetUp() override {
-    BrowsingDataRemoverFactory::GetForBrowserContext(profile())
-        ->SetEmbedderDelegate(
-            base::MakeUnique<MockBrowsingDataRemoverDelegate>());
+    content::BrowserContext::GetBrowsingDataRemover(profile())
+        ->SetEmbedderDelegate(&mock_delegate_);
     run_loop_.reset(new base::RunLoop());
   }
 
   content::BrowserContext* profile() { return &profile_; }
 
-  MockBrowsingDataRemoverDelegate* delegate() {
-    return static_cast<MockBrowsingDataRemoverDelegate*>(
-        BrowsingDataRemoverFactory::GetForBrowserContext(profile())
-            ->GetEmbedderDelegate());
-  }
+  MockBrowsingDataRemoverDelegate* delegate() { return &mock_delegate_; }
 
   void OnClearingFinished() { run_loop_->Quit(); }
 
   void WaitForClearingFinished() {
     run_loop_->Run();
     run_loop_.reset(new base::RunLoop());
   }
 
  private:
   std::unique_ptr<base::RunLoop> run_loop_;
+  MockBrowsingDataRemoverDelegate mock_delegate_;
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
 };
 
 // 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 {
     bool cookies;
     bool storage;
     bool cache;
     int mask;
   } test_cases[] = {
       {false, false, false, 0},
       {true, false, false,
-       BrowsingDataRemover::DATA_TYPE_COOKIES |
-           BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+       content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+           content::BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
            ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA},
-      {false, true, false, BrowsingDataRemover::DATA_TYPE_DOM_STORAGE},
-      {false, false, true, BrowsingDataRemover::DATA_TYPE_CACHE},
+      {false, true, false, content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE},
+      {false, false, true, content::BrowsingDataRemover::DATA_TYPE_CACHE},
       {true, true, false,
-       BrowsingDataRemover::DATA_TYPE_COOKIES |
-           BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+       content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+           content::BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
            ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA |
-           BrowsingDataRemover::DATA_TYPE_DOM_STORAGE},
+           content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE},
       {true, false, true,
-       BrowsingDataRemover::DATA_TYPE_COOKIES |
-           BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+       content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+           content::BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
            ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA |
-           BrowsingDataRemover::DATA_TYPE_CACHE},
+           content::BrowsingDataRemover::DATA_TYPE_CACHE},
       {false, true, true,
-       BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
-           BrowsingDataRemover::DATA_TYPE_CACHE},
+       content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
+           content::BrowsingDataRemover::DATA_TYPE_CACHE},
       {true, true, true,
-       BrowsingDataRemover::DATA_TYPE_COOKIES |
-           BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+       content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+           content::BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
            ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA |
-           BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
-           BrowsingDataRemover::DATA_TYPE_CACHE},
+           content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
+           content::BrowsingDataRemover::DATA_TYPE_CACHE},
   };
 
   for (unsigned int i = 0; i < arraysize(test_cases); ++i) {
     SCOPED_TRACE(base::StringPrintf("Test case %d", i));
     const TestCase& test_case = test_cases[i];
 
     // We always delete data for all time and all origin types.
     int all_origin_types = ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES;
 
     // Some data are deleted for the origin and some for the registrable domain.
     // Depending on the chosen datatypes, this might result into one or two
     // 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 |
+        content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+        content::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) {
       delegate()->ExpectCallDontCareAboutFilterBuilder(
           base::Time(), base::Time::Max(), registrable_domain_deletion_mask,
           all_origin_types);
     }
 
@@ skipping 61 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);
 
     delegate()->ExpectCall(
         base::Time(), base::Time::Max(),
-        BrowsingDataRemover::DATA_TYPE_COOKIES |
-            BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+        content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+            content::BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
             ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA,
         ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES,
         *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)));
 
     delegate()->ExpectCall(base::Time(), base::Time::Max(),
-                           BrowsingDataRemover::DATA_TYPE_CACHE,
+                           content::BrowsingDataRemover::DATA_TYPE_CACHE,
                            ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES,
                            *origin_filter_builder);
 
     client.ClearSiteData(
         profile(), url::Origin(GURL(test_case.origin)), true /* cookies */,
         false /* storage */, true /* cache */,
         base::Bind(
             &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
             base::Unretained(this)));
     WaitForClearingFinished();
@@ skipping 39 matching lines @@
   client.ClearSiteData(
       profile(), origin, true /* cookies */, false /* storage */,
       true /* cache */,
       base::Bind(
           &ChromeContentBrowserClientClearSiteDataTest::OnClearingFinished,
           base::Unretained(this)));
   WaitForClearingFinished();
 }
 
 }  // namespace