Move BrowsingDataRemoverImpl:: CompletionInhibitor to the public interface

chrome/browser/profiles/profile_manager_browsertest.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 <stddef.h>
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 36 matching lines @@
   EXPECT_EQ(chrome::GetBrowserCount(profile), 0U);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 1U);
   if (status == Profile::CREATE_STATUS_INITIALIZED)
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 // An observer that returns back to test code after one or more profiles was
 // deleted. It also create ScopedKeepAlive object to prevent browser shutdown
 // started in case browser has become windowless.
 class MultipleProfileDeletionObserver
-    : public BrowsingDataRemoverImpl::CompletionInhibitor,
-      public ProfileAttributesStorage::Observer {
+    : public ProfileAttributesStorage::Observer {
  public:
   explicit MultipleProfileDeletionObserver(size_t expected_count)
       : expected_count_(expected_count),
         profiles_created_count_(0),
         profiles_data_removed_count_(0) {
     EXPECT_GT(expected_count_, 0u);
-    g_browser_process->profile_manager()->GetProfileAttributesStorage().
-        AddObserver(this);
-    BrowsingDataRemoverImpl::set_completion_inhibitor_for_testing(this);
+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    profile_manager->GetProfileAttributesStorage().AddObserver(this);
+
+    base::Callback<void(const base::Closure&)> would_complete_callback =
+        base::Bind(&MultipleProfileDeletionObserver::
+                       OnBrowsingDataRemoverWouldComplete,
+                   base::Unretained(this));
+    for (Profile* profile : profile_manager->GetLoadedProfiles()) {
+      BrowsingDataRemoverFactory::GetForBrowserContext(profile)
+          ->SetWouldCompleteCallbackForTesting(would_complete_callback);
+    }
   }
+
   ~MultipleProfileDeletionObserver() override {
     g_browser_process->profile_manager()->GetProfileAttributesStorage().
         RemoveObserver(this);
-    BrowsingDataRemoverImpl::set_completion_inhibitor_for_testing(nullptr);
   }
+
   void Wait() {
     keep_alive_ = base::MakeUnique<ScopedKeepAlive>(
         KeepAliveOrigin::PROFILE_HELPER, KeepAliveRestartOption::DISABLED);
     loop_.Run();
   }
 
  private:
   void OnProfileWillBeRemoved(const base::FilePath& profile_path) override {
     profiles_created_count_++;
     MaybeQuit();
   }
 
   // TODO(https://crbug.com/704601): remove this code when bug is fixed.
   void OnBrowsingDataRemoverWouldComplete(
-      BrowsingDataRemoverImpl* remover,
-      const base::Closure& continue_to_completion) override {
+      const base::Closure& continue_to_completion) {
     continue_to_completion.Run();
     profiles_data_removed_count_++;
     MaybeQuit();
   }
 
   void MaybeQuit() {
     DLOG(INFO) << profiles_created_count_
                << " profiles removed, and "
                << profiles_data_removed_count_
                << " profile data removed of expected "
@@ skipping 524 matching lines @@
 
   EXPECT_FALSE(profile->HasOffTheRecordProfile());
   EXPECT_FALSE(profile_manager->IsValidProfile(incognito_profile));
   EXPECT_EQ(initial_profile_count, profile_manager->GetNumberOfProfiles());
   // After destroying the incognito profile incognito preferences should be
   // cleared so the default save path should be taken from the main profile.
   EXPECT_FALSE(profile->GetOffTheRecordPrefs()
                    ->GetFilePath(prefs::kSaveFileDefaultDirectory)
                    .empty());
 }