Android component updater

browser/BUILD.gn

@@ -46,14 +46,12 @@ source_set("browser_process") {
     "component_updater/brave_component_installer.h",
     "component_updater/brave_component_updater_configurator.cc",
     "component_updater/brave_component_updater_configurator.h",
+    "component_updater/brave_component_updater_delegate.cc",
+    "component_updater/brave_component_updater_delegate.h",
     "component_updater/brave_crx_update_service.cc",
     "component_updater/brave_crx_update_service.h",
     "content_settings/brave_cookie_settings_factory.cc",
     "content_settings/brave_cookie_settings_factory.h",
-    # TODO(bridiver) - move this from extensions -> component_updater
-    # and rename to BraveComponent
-    "extensions/brave_component_extension.cc",
-    "extensions/brave_component_extension.h",
     "geolocation/brave_geolocation_permission_context.cc",
     "geolocation/brave_geolocation_permission_context.h",
     "mac/sparkle_glue.mm",
@@ -91,6 +89,7 @@ source_set("browser_process") {
     "//brave/browser/tor",
     "//brave/common",
     "//brave/components/brave_ads/browser",
+    "//brave/components/brave_component_updater/browser",
     "//brave/components/brave_referrals/browser",
     "//brave/components/brave_rewards/browser",
     "//brave/components/brave_shields/browser:brave_shields",

browser/brave_browser_process_impl.cc

@@ -13,6 +13,7 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "brave/browser/brave_stats_updater.h"
 #include "brave/browser/component_updater/brave_component_updater_configurator.h"
+#include "brave/browser/component_updater/brave_component_updater_delegate.h"
 #include "brave/browser/extensions/brave_tor_client_updater.h"
 #include "brave/browser/profiles/brave_profile_manager.h"
 #include "brave/components/brave_shields/browser/ad_block_custom_filters_service.h"
@@ -76,6 +77,15 @@ BraveBrowserProcessImpl::BraveBrowserProcessImpl(StartupData* startup_data)
                      base::Unretained(brave_stats_updater_.get())));
 }
 
+brave_component_updater::BraveComponent::Delegate*
+BraveBrowserProcessImpl::brave_component_updater_delegate() {
+  if (!brave_component_updater_delegate_)
+    brave_component_updater_delegate_ =
+        std::make_unique<brave::BraveComponentUpdaterDelegate>();
+
+  return brave_component_updater_delegate_.get();
+}
+
 component_updater::ComponentUpdateService*
 BraveBrowserProcessImpl::component_updater() {
   if (component_updater_)
@@ -117,23 +127,26 @@ BraveBrowserProcessImpl::ad_block_service() {
   if (ad_block_service_)
     return ad_block_service_.get();
 
-  ad_block_service_ = brave_shields::AdBlockServiceFactory();
+  ad_block_service_ =
+      brave_shields::AdBlockServiceFactory(brave_component_updater_delegate());
   return ad_block_service_.get();
 }
 
 brave_shields::AdBlockCustomFiltersService*
 BraveBrowserProcessImpl::ad_block_custom_filters_service() {
   if (!ad_block_custom_filters_service_)
     ad_block_custom_filters_service_ =
-        brave_shields::AdBlockCustomFiltersServiceFactory();
+        brave_shields::AdBlockCustomFiltersServiceFactory(
+            brave_component_updater_delegate());
   return ad_block_custom_filters_service_.get();
 }
 
 brave_shields::AdBlockRegionalServiceManager*
 BraveBrowserProcessImpl::ad_block_regional_service_manager() {
   if (!ad_block_regional_service_manager_)
     ad_block_regional_service_manager_ =
-        brave_shields::AdBlockRegionalServiceManagerFactory();
+        brave_shields::AdBlockRegionalServiceManagerFactory(
+              brave_component_updater_delegate());
   return ad_block_regional_service_manager_.get();
 }
 
@@ -179,15 +192,17 @@ brave_shields::HTTPSEverywhereService*
 BraveBrowserProcessImpl::https_everywhere_service() {
   if (!https_everywhere_service_)
     https_everywhere_service_ =
-        brave_shields::HTTPSEverywhereServiceFactory();
+        brave_shields::HTTPSEverywhereServiceFactory(
+            brave_component_updater_delegate());
   return https_everywhere_service_.get();
 }
 
 brave_shields::LocalDataFilesService*
 BraveBrowserProcessImpl::local_data_files_service() {
   if (!local_data_files_service_)
     local_data_files_service_ =
-        brave_shields::LocalDataFilesServiceFactory();
+        brave_shields::LocalDataFilesServiceFactory(
+            brave_component_updater_delegate());
   return local_data_files_service_.get();
 }
 
@@ -197,7 +212,8 @@ BraveBrowserProcessImpl::tor_client_updater() {
   if (tor_client_updater_)
     return tor_client_updater_.get();
 
-  tor_client_updater_ = extensions::BraveTorClientUpdaterFactory();
+  tor_client_updater_ = extensions::BraveTorClientUpdaterFactory(
+      brave_component_updater_delegate());
   return tor_client_updater_.get();
 }
 #endif

browser/brave_browser_process_impl.h

@@ -9,6 +9,7 @@
 #include <memory>
 
 #include "brave/browser/tor/buildflags.h"
+#include "brave/components/brave_component_updater/browser/brave_component.h"
 #include "brave/components/brave_referrals/buildflags/buildflags.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "extensions/buildflags/buildflags.h"
@@ -39,6 +40,8 @@ namespace extensions {
 class BraveTorClientUpdater;
 }
 
+using brave_component_updater::BraveComponent;
+
 class BraveBrowserProcessImpl : public BrowserProcessImpl {
  public:
   explicit BraveBrowserProcessImpl(StartupData* startup_data);
@@ -71,6 +74,9 @@ class BraveBrowserProcessImpl : public BrowserProcessImpl {
  private:
   void CreateProfileManager();
 
+  BraveComponent::Delegate* brave_component_updater_delegate();
+
+  std::unique_ptr<BraveComponent::Delegate> brave_component_updater_delegate_;
   std::unique_ptr<brave_shields::AdBlockService> ad_block_service_;
   std::unique_ptr<brave_shields::AdBlockCustomFiltersService>
       ad_block_custom_filters_service_;

browser/component_updater/brave_component_installer.cc

@@ -77,10 +77,10 @@ namespace brave {
 BraveComponentInstallerPolicy::BraveComponentInstallerPolicy(
     const std::string& name,
     const std::string& base64_public_key,
-    const ReadyCallback& ready_callback)
+    ReadyCallback ready_callback)
     : name_(name),
       base64_public_key_(base64_public_key),
-      ready_callback_(ready_callback) {
+      ready_callback_(std::move(ready_callback)) {
   base::Base64Decode(base64_public_key, &public_key_);
 }
 
@@ -117,10 +117,12 @@ void BraveComponentInstallerPolicy::OnCustomUninstall() {
 }
 
 void BraveComponentInstallerPolicy::ComponentReady(
-  const base::Version& version,
-  const base::FilePath& install_dir,
-  std::unique_ptr<base::DictionaryValue> manifest) {
-  ready_callback_.Run(install_dir, GetManifestString(*manifest, base64_public_key_));
+    const base::Version& version,
+    const base::FilePath& install_dir,
+    std::unique_ptr<base::DictionaryValue> manifest) {
+  std::move(ready_callback_).Run(
+      install_dir,
+      GetManifestString(*manifest, base64_public_key_));
 }
 
 base::FilePath BraveComponentInstallerPolicy::GetRelativeInstallDir() const {
@@ -152,11 +154,12 @@ void RegisterComponent(
     component_updater::ComponentUpdateService* cus,
     const std::string& name,
     const std::string& base64_public_key,
-    const base::Closure& registered_callback,
-    const ReadyCallback& ready_callback) {
+    base::OnceClosure registered_callback,
+    ReadyCallback ready_callback) {
   auto installer = base::MakeRefCounted<component_updater::ComponentInstaller>(
-    std::make_unique<BraveComponentInstallerPolicy>(name, base64_public_key, ready_callback));
-  installer->Register(cus, registered_callback);
+      std::make_unique<BraveComponentInstallerPolicy>(
+          name, base64_public_key, std::move(ready_callback)));
+  installer->Register(cus, std::move(registered_callback));
 }
 
 }  // namespace brave

browser/component_updater/brave_component_installer.h

@@ -18,11 +18,7 @@
 #include "components/component_updater/component_installer.h"
 #include "components/update_client/update_client.h"
 
-namespace base {
-class FilePath;
-}  // namespace base
-
-using ReadyCallback = base::Callback<void(const base::FilePath&,
+using ReadyCallback = base::OnceCallback<void(const base::FilePath&,
     const std::string& manifest)>;
 
 namespace brave {
@@ -32,7 +28,7 @@ class BraveComponentInstallerPolicy :
  public:
   explicit BraveComponentInstallerPolicy(const std::string& name,
       const std::string& base64_public_key,
-      const ReadyCallback& ready_callback);
+      ReadyCallback ready_callback);
 
   ~BraveComponentInstallerPolicy() override;
 
@@ -67,8 +63,8 @@ class BraveComponentInstallerPolicy :
 void RegisterComponent(component_updater::ComponentUpdateService* cus,
     const std::string& name,
     const std::string& base64_public_key,
-    const base::Closure& registered_callback,
-    const ReadyCallback& ready_callback);
+    base::OnceClosure registered_callback,
+    ReadyCallback ready_callback);
 
 }  // namespace brave
 

browser/component_updater/brave_component_updater_delegate.cc

@@ -0,0 +1,44 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/component_updater/brave_component_updater_delegate.h"
+
+#include "brave/browser/component_updater/brave_component_installer.h"
+#include "chrome/browser/ui/webui/components_ui.h"
+#include "chrome/browser/browser_process.h"
+#include "components/component_updater/component_updater_service.h"
+
+using brave_component_updater::BraveComponent;
+
+namespace brave {
+
+BraveComponentUpdaterDelegate::BraveComponentUpdaterDelegate() {
+}
+
+BraveComponentUpdaterDelegate::~BraveComponentUpdaterDelegate() {}
+
+void BraveComponentUpdaterDelegate::Register(
+    const std::string& component_name,
+    const std::string& component_base64_public_key,
+    base::OnceClosure registered_callback,
+    BraveComponent::ReadyCallback ready_callback) {
+  brave::RegisterComponent(g_browser_process->component_updater(),
+                           component_name,
+                           component_base64_public_key,
+                           std::move(registered_callback),
+                           std::move(ready_callback));
+}
+
+bool BraveComponentUpdaterDelegate::Unregister(
+    const std::string& component_id) {
+  return g_browser_process->component_updater()->UnregisterComponent(
+      component_id);
+}
+
+void BraveComponentUpdaterDelegate::OnDemandUpdate(
+    const std::string& component_id) {
+  ComponentsUI::OnDemandUpdate(component_id);
+}
+
+}  // namespace brave

browser/component_updater/brave_component_updater_delegate.h

@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_COMPONENT_UPDATER_BRAVE_COMPONENT_UPDATER_DELEGATE_H_
+#define BRAVE_BROWSER_COMPONENT_UPDATER_BRAVE_COMPONENT_UPDATER_DELEGATE_H_
+
+#include <string>
+
+#include "base/macros.h"
+#include "brave/components/brave_component_updater/browser/brave_component.h"
+
+using brave_component_updater::BraveComponent;
+
+namespace brave {
+
+class BraveComponentUpdaterDelegate : public BraveComponent::Delegate {
+ public:
+  BraveComponentUpdaterDelegate();
+  ~BraveComponentUpdaterDelegate() override;
+
+  // brave_component_updater::BraveComponent::Delegate implementation
+  void Register(const std::string& component_name,
+                const std::string& component_base64_public_key,
+                base::OnceClosure registered_callback,
+                BraveComponent::ReadyCallback ready_callback) override;
+  bool Unregister(const std::string& component_id) override;
+  void OnDemandUpdate(const std::string& component_id) override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BraveComponentUpdaterDelegate);
+};
+
+}  // namespace brave
+
+#endif  // BRAVE_BROWSER_COMPONENT_UPDATER_BRAVE_COMPONENT_UPDATER_DELEGATE_H_

browser/extensions/BUILD.gn

@@ -45,6 +45,7 @@ source_set("extensions") {
     "//brave/app:brave_generated_resources_grit",
     "//brave/common:pref_names",
     "//brave/common/extensions/api",
+    "//brave/components/brave_component_updater/browser",
     "//brave/components/brave_extension:static_resources",
     "//brave/components/brave_extension:generated_resources",
     "//brave/components/brave_sync",