Use mojo for WebappRegistry.

chrome/browser/browsing_data/browsing_data_remover.h

Index: chrome/browser/browsing_data/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 7d18345e2d39f03ae1a852f29043b00acffe089b..a917cd5bb2fc09702dbd7e5c4fbe898fe014e1e4 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -39,6 +39,10 @@
 #include "chromeos/dbus/dbus_method_call_status.h"
 #endif
 
+#if BUILDFLAG(ANDROID_JAVA_UI)
+#include "chrome/browser/android/webapps/webapp_registry.mojom.h"
+#endif
+
 class BrowsingDataRemoverFactory;
 class HostContentSettingsMap;
 class IOThread;
@@ -59,10 +63,6 @@ namespace net {
 class URLRequestContextGetter;
 }
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
-class WebappRegistry;
-#endif
-
 // BrowsingDataRemover is responsible for removing data related to browsing:
 // visits in url database, downloads, cookies ...
 class BrowsingDataRemover : public KeyedService
@@ -228,7 +228,7 @@ class BrowsingDataRemover : public KeyedService
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
   void OverrideWebappRegistryForTesting(
-      std::unique_ptr<WebappRegistry> webapp_registry);
+      mojom::WebappRegistryPtr webapp_registry);
 #endif
 
   // Parameters of the last call are exposed to be used by tests. Removal and
@@ -477,9 +477,9 @@ class BrowsingDataRemover : public KeyedService
   content::StoragePartition* storage_partition_for_testing_ = nullptr;
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  // WebappRegistry makes calls across the JNI. In unit tests, the Java side is
-  // not initialised, so the registry must be mocked out.
-  std::unique_ptr<WebappRegistry> webapp_registry_;
+  // WebappRegistry makes calls to Java using mojo. In unit tests, the Java side
+  // is not initialised, so the registry must be mocked out.
+  mojom::WebappRegistryPtr webapp_registry_;
 #endif
 
   base::WeakPtrFactory<BrowsingDataRemover> weak_ptr_factory_;