Use mojo for WebappRegistry.

chrome/browser/browsing_data/browsing_data_remover.cc

Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index cc28d811f5cf714894cc6e8b8088d55c4368443b..5df348cc7f442253ee0edfdeaf96a7a00a5a7ebe 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -82,11 +82,12 @@
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
-#include "chrome/browser/android/webapps/webapp_registry.h"
 #include "chrome/browser/precache/precache_manager_factory.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/precache/content/precache_manager.h"
+#include "content/public/browser/android/java_interfaces.h"
+#include "services/shell/public/cpp/interface_provider.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -247,6 +248,14 @@ void ClearChannelIDsOnIOThread(
                  base::RetainedRef(std::move(rq_context)), callback));
 }
 
+#if BUILDFLAG(ANDROID_JAVA_UI)
+mojom::WebappRegistryPtr GetDefaultWebappRegistryPtr() {
+  mojom::WebappRegistryPtr webapp_registry;
+  content::GetGlobalJavaInterfaces()->GetInterface(&webapp_registry);
+  return webapp_registry;
+}
+#endif
+
 }  // namespace
 
 BrowsingDataRemover::CompletionInhibitor*
@@ -292,7 +301,7 @@ BrowsingDataRemover::BrowsingDataRemover(
       remove_mask_(-1),
       origin_type_mask_(-1),
 #if BUILDFLAG(ANDROID_JAVA_UI)
-      webapp_registry_(new WebappRegistry()),
+      webapp_registry_(GetDefaultWebappRegistryPtr()),
 #endif
       weak_ptr_factory_(this) {
   DCHECK(browser_context);
@@ -977,7 +986,7 @@ void BrowsingDataRemover::RemoveImpl(
     // 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_->UnregisterWebapps(
+    webapp_registry_->UnregisterAllWebapps(
         base::Bind(&BrowsingDataRemover::OnClearedWebappData,
                    weak_ptr_factory_.GetWeakPtr()));
   }
@@ -1028,8 +1037,8 @@ void BrowsingDataRemover::OverrideStoragePartitionForTesting(
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 void BrowsingDataRemover::OverrideWebappRegistryForTesting(
-    std::unique_ptr<WebappRegistry> webapp_registry) {
-  webapp_registry_.reset(webapp_registry.release());
+    mojom::WebappRegistryPtr webapp_registry) {
+  webapp_registry_ = std::move(webapp_registry);
 }
 #endif