Revert of [Reland] Refactor WebappRegistry into a singleton instance.

chrome/browser/browsing_data/browsing_data_remover.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 "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 684 matching lines @@
       precache_manager->ClearHistory();
       // The above calls are done on the UI thread but do their work on the DB
       // thread. So wait for it.
       BrowserThread::PostTaskAndReply(
           BrowserThread::DB, FROM_HERE, base::Bind(&base::DoNothing),
           base::Bind(&BrowsingDataRemover::OnClearedPrecacheHistory,
                      weak_ptr_factory_.GetWeakPtr()));
     }
 
     // Clear the history information (last launch time and origin URL) of any
-    // registered webapps.
-    webapp_registry_->ClearWebappHistoryForUrls(filter);
+    // registered webapps. The webapp_registry makes a JNI call into a Java-side
+    // AsyncTask, so don't wait for the reply.
+    waiting_for_clear_webapp_history_ = true;
+    webapp_registry_->ClearWebappHistoryForUrls(
+        filter,
+        base::Bind(&BrowsingDataRemover::OnClearedWebappHistory,
+                   weak_ptr_factory_.GetWeakPtr()));
 #endif
 
     data_reduction_proxy::DataReductionProxySettings*
         data_reduction_proxy_settings =
             DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
                 profile_);
     // |data_reduction_proxy_settings| is null if |profile_| is off the record.
     if (data_reduction_proxy_settings) {
       data_reduction_proxy::DataReductionProxyService*
           data_reduction_proxy_service =
@@ skipping 431 matching lines @@
       waiting_for_clear_domain_reliability_monitor_ = true;
       service->ClearBrowsingData(
           mode,
           filter,
           base::Bind(&BrowsingDataRemover::OnClearedDomainReliabilityMonitor,
                      weak_ptr_factory_.GetWeakPtr()));
     }
   }
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  // Clear all data associated with registered webapps.
-  if (remove_mask & REMOVE_WEBAPP_DATA)
-    webapp_registry_->UnregisterWebappsForUrls(filter);
+  if (remove_mask & REMOVE_WEBAPP_DATA) {
+    // Clear all data associated with registered webapps. The webapp_registry
+    // makes a JNI call into a Java-side AsyncTask, so don't wait for the reply.
+    waiting_for_clear_webapp_data_ = true;
+    webapp_registry_->UnregisterWebappsForUrls(
+        filter,
+        base::Bind(&BrowsingDataRemover::OnClearedWebappData,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
 
   // For now we're considering offline pages as cache, so if we're removing
   // cache we should remove offline pages as well.
   if ((remove_mask & REMOVE_CACHE)) {
     waiting_for_clear_offline_page_data_ = true;
     offline_pages::OfflinePageModelFactory::GetForBrowserContext(profile_)
         ->DeleteCachedPagesByURLPredicate(
             filter, base::Bind(&BrowsingDataRemover::OnClearedOfflinePageData,
                                weak_ptr_factory_.GetWeakPtr()));
   }
@@ skipping 87 matching lines @@
          !waiting_for_clear_http_auth_cache_ &&
          !waiting_for_clear_keyword_data_ && !waiting_for_clear_nacl_cache_ &&
          !waiting_for_clear_network_predictor_ &&
          !waiting_for_clear_networking_history_ &&
          !waiting_for_clear_passwords_ && !waiting_for_clear_passwords_stats_ &&
          !waiting_for_clear_platform_keys_ &&
          !waiting_for_clear_plugin_data_count_ &&
          !waiting_for_clear_pnacl_cache_ &&
 #if BUILDFLAG(ANDROID_JAVA_UI)
          !waiting_for_clear_precache_history_ &&
+         !waiting_for_clear_webapp_data_ &&
+         !waiting_for_clear_webapp_history_ &&
          !waiting_for_clear_offline_page_data_ &&
 #endif
 #if defined(ENABLE_WEBRTC)
          !waiting_for_clear_webrtc_logs_ &&
 #endif
          !waiting_for_clear_storage_partition_data_ &&
          !waiting_for_clear_auto_sign_in_;
 }
 
 void BrowsingDataRemover::OnKeywordsLoaded(
@@ skipping 238 matching lines @@
 }
 #endif
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 void BrowsingDataRemover::OnClearedPrecacheHistory() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   waiting_for_clear_precache_history_ = false;
   NotifyIfDone();
 }
 
+void BrowsingDataRemover::OnClearedWebappData() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  waiting_for_clear_webapp_data_ = false;
+  NotifyIfDone();
+}
+
+void BrowsingDataRemover::OnClearedWebappHistory() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  waiting_for_clear_webapp_history_ = false;
+  NotifyIfDone();
+}
+
 void BrowsingDataRemover::OnClearedOfflinePageData(
     offline_pages::OfflinePageModel::DeletePageResult result) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   waiting_for_clear_offline_page_data_ = false;
   NotifyIfDone();
 }
 #endif
 
 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   waiting_for_clear_domain_reliability_monitor_ = false;
   NotifyIfDone();
 }