Move BrowsingDataRemoverImpl:: CompletionInhibitor to the public interface

chrome/browser/ui/webui/profile_helper_browsertest.cc

 // Copyright 2017 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 "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/browser_process.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/browsing_data/browsing_data_remover_test_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/webui/profile_helper.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
@@ skipping 39 matching lines @@
     if (browser->profile() == profile_)
       loop_.Quit();
   }
 
  private:
   Profile* profile_;
   base::RunLoop loop_;
   ScopedObserver<BrowserList, chrome::BrowserListObserver> scoped_observer_;
 };
 
-// TODO(bug 704601): remove it when bug is fixed.
-class BrowsingDataRemoverObserver
-    : public BrowsingDataRemoverImpl::CompletionInhibitor {
- public:
-  explicit BrowsingDataRemoverObserver(const base::Closure& callback)
-      : callback_(callback) {
-    BrowsingDataRemoverImpl::set_completion_inhibitor_for_testing(this);
-  }
-  ~BrowsingDataRemoverObserver() override {
-    BrowsingDataRemoverImpl::set_completion_inhibitor_for_testing(nullptr);
-  }
-
- private:
-  void OnBrowsingDataRemoverWouldComplete(
-      BrowsingDataRemoverImpl* remover,
-      const base::Closure& continue_to_completion) override {
-    continue_to_completion.Run();
-    callback_.Run();
-  }
-
-  const base::Closure callback_;
-};
-
 }  // namespace
 
 using ProfileHelperTest = InProcessBrowserTest;
 
 IN_PROC_BROWSER_TEST_F(ProfileHelperTest, OpenNewWindowForProfile) {
   BrowserList* browser_list = BrowserList::GetInstance();
 
   Browser* original_browser = browser();
   Profile* original_profile = original_browser->profile();
   std::unique_ptr<ExpectBrowserActivationForProfile> activation_observer;
@@ skipping 96 matching lines @@
       g_browser_process->profile_manager()->GetProfileAttributesStorage();
 
   BrowserList* browser_list = BrowserList::GetInstance();
   EXPECT_EQ(1u, browser_list->size());
   EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
   EXPECT_EQ(1u, storage.GetNumberOfProfiles());
 
   Profile* additional_profile = CreateProfile();
   EXPECT_EQ(2u, storage.GetNumberOfProfiles());
 
-  base::RunLoop loop;
-  BrowsingDataRemoverObserver observer(loop.QuitClosure());
+  BrowsingDataRemoverCompletionInhibitor inhibitor(
+      BrowsingDataRemoverFactory::GetForBrowserContext(additional_profile));
   webui::DeleteProfileAtPath(additional_profile->GetPath(), &web_ui,
                              ProfileMetrics::DELETE_PROFILE_SETTINGS);
-  loop.Run();
+  inhibitor.BlockUntilNearCompletion();

[msramek, 2017/04/10 13:20:08]

This test was just reinventing BlockUntilNearCompletion() and
ContinueToCompletion(), so I rewrote it.

+  inhibitor.ContinueToCompletion();
 
   EXPECT_EQ(1u, browser_list->size());
   EXPECT_TRUE(base::ContainsValue(*browser_list, original_browser));
   EXPECT_EQ(1u, storage.GetNumberOfProfiles());
 }