Use mojo for WebappRegistry.

chrome/browser/browsing_data/browsing_data_remover.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 21 matching lines @@
 #include "url/gurl.h"
 
 #if defined(ENABLE_PLUGINS)
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #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;
 class BrowsingDataFilterBuilder;
 class Profile;
 
 namespace chrome_browser_net {
 class Predictor;
 }
 
 namespace content {
 class BrowserContext;
 class PluginDataRemover;
 class StoragePartition;
 }
 
 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
 #if defined(ENABLE_PLUGINS)
                             , public PepperFlashSettingsManager::Client
 #endif
 {
  public:
   // Mask used for Remove.
   enum RemoveDataMask {
@@ skipping 145 matching lines @@
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Used for testing.
   void OverrideStoragePartitionForTesting(
       content::StoragePartition* storage_partition);
 
 #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
   // origin type masks equal to -1 mean that no removal has ever been executed.
   // TODO(msramek): If other consumers than tests are interested in this,
   // consider returning them in OnBrowsingDataRemoverDone() callback.
   const base::Time& GetLastUsedBeginTime();
   const base::Time& GetLastUsedEndTime();
   int GetLastUsedRemovalMask();
   int GetLastUsedOriginTypeMask();
@@ skipping 228 matching lines @@
 
   // Used if we need to clear history.
   base::CancelableTaskTracker history_task_tracker_;
 
   std::unique_ptr<TemplateURLService::Subscription> template_url_sub_;
 
   // We do not own this.
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_