Implement a task scheduler for BrowsingDataRemover

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 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/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 #include <stddef.h>
 
 #include <memory>
@@ skipping 586 matching lines @@
 }
 
 static void ClearBrowsingData(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jintArray>& data_types,
     jint time_period,
     const JavaParamRef<jobjectArray>& jexcluding_domains) {
   BrowsingDataRemover* browsing_data_remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(GetOriginalProfile());
-  // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is
-  // done.
-  new ClearBrowsingDataObserver(env, obj, browsing_data_remover);
 
   std::vector<int> data_types_vector;
   base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector);
 
   int remove_mask = 0;
   for (const int data_type : data_types_vector) {
     switch (static_cast<browsing_data::BrowsingDataType>(data_type)) {
       case browsing_data::HISTORY:
         remove_mask |= BrowsingDataRemover::REMOVE_HISTORY;
         break;
@@ skipping 14 matching lines @@
         // Bookmarks are deleted separately on the Java side.
         NOTREACHED();
         break;
       case browsing_data::NUM_TYPES:
         NOTREACHED();
     }
   }
   std::vector<std::string> excluding_domains;
   base::android::AppendJavaStringArrayToStringVector(
       env, jexcluding_domains.obj(), &excluding_domains);
-  RegistrableDomainFilterBuilder filter_builder(
-      BrowsingDataFilterBuilder::BLACKLIST);
+  std::unique_ptr<RegistrableDomainFilterBuilder> filter_builder(
+      new RegistrableDomainFilterBuilder(BrowsingDataFilterBuilder::BLACKLIST));
   for (const std::string& domain : excluding_domains) {
-    filter_builder.AddRegisterableDomain(domain);
+    filter_builder->AddRegisterableDomain(domain);
   }
 
   if (!excluding_domains.empty()) {
     ImportantSitesUtil::RecordMetricsForBlacklistedSites(GetOriginalProfile(),
                                                          excluding_domains);
   }
 
-  browsing_data_remover->RemoveWithFilter(
+  // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is
+  // done.
+  ClearBrowsingDataObserver* observer =
+      new ClearBrowsingDataObserver(env, obj, browsing_data_remover);
+
+  browsing_data_remover->RemoveWithFilterAndReply(
       BrowsingDataRemover::Period(
           static_cast<browsing_data::TimePeriod>(time_period)),
-      remove_mask, BrowsingDataHelper::UNPROTECTED_WEB, filter_builder);
+      remove_mask, BrowsingDataHelper::UNPROTECTED_WEB,
+      std::move(filter_builder), observer);
 }
 
 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
 }
 
 static void FetchImportantSites(JNIEnv* env,
                                 const JavaParamRef<jclass>& clazz,
                                 const JavaParamRef<jobject>& java_callback) {
@@ skipping 494 matching lines @@
 
   return ConvertJavaStringToUTF8(android_permission);
 }
 
 static void SetSupervisedUserId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kSupervisedUserId,
                               ConvertJavaStringToUTF8(env, pref));
 }