[cr137] AddExtension now through ExtensionRegistrar

This is one of many changes moving methods to the registrar.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/69d2b7fcffcda024f1c4f22a79c6dab0ff2107ef

commit 69d2b7fcffcda024f1c4f22a79c6dab0ff2107ef
Author: David Bertoni <dbertoni@chromium.org>
Date:   Thu Apr 24 02:12:34 2025 -0700

    [Extensions] Remove ExtensionsService::AddExtension.

    This is part of the ExtensionService break up effort.

    This member function is just a call to ExtensionRegistrar::AddExtension,
    so no behavioral change is expected.

    Bug: 405411622
    Change-Id: If758d6adf49af2045bf333ded7635752345b4cd9
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6476246
    Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
    Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
    Auto-Submit: David Bertoni <dbertoni@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1451012}
This commit is contained in:
Claudio DeSouza
2025-05-13 15:53:20 -04:00
committed by Max Karolinskiy
parent 7c67dee194
commit 7d1b69f961
6 changed files with 13 additions and 27 deletions
+1 -3
View File
@@ -76,8 +76,6 @@ void BraveComponentLoader::OnComponentReady(std::string extension_id,
void BraveComponentLoader::ReinstallAsNonComponent(
const std::string& extension_id) {
extensions::ExtensionService* service =
extensions::ExtensionSystem::Get(profile_)->extension_service();
extensions::ExtensionRegistry* registry =
extensions::ExtensionRegistry::Get(profile_);
const Extension* extension = registry->GetInstalledExtension(extension_id);
@@ -89,7 +87,7 @@ void BraveComponentLoader::ReinstallAsNonComponent(
scoped_refptr<Extension> normal_extension = Extension::Create(
extension->path(), ManifestLocation::kExternalPref,
*extension->manifest()->value(), extension->creation_flags(), &error);
service->AddExtension(normal_extension.get());
ExtensionRegistrar::Get(profile_)->AddExtension(normal_extension);
}
}
@@ -141,7 +141,7 @@ class BraveWebTorrentNavigationThrottleUnitTest
.SetID(brave_webtorrent_extension_id)
.Build();
ASSERT_TRUE(extension_);
extension_service()->AddExtension(extension_.get());
ExtensionRegistrar::Get(profile())->AddExtension(extension_);
}
private:
@@ -17,7 +17,6 @@
#include "brave/browser/importer/extensions_import_helpers.h"
#include "brave/common/importer/importer_constants.h"
#include "brave/components/constants/brave_paths.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/load_error_reporter.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/importer/importer_progress_observer.h"
@@ -25,6 +24,7 @@
#include "components/value_store/test_value_store_factory.h"
#include "components/value_store/value_store.h"
#include "content/public/test/browser_task_environment.h"
#include "extensions/browser/extension_registrar.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_builder.h"
@@ -111,12 +111,8 @@ class BraveExternalProcessImporterHostUnitTest : public testing::Test {
extensions::ExtensionSystem::Get(GetProfile()));
extension_system->CreateExtensionService(
base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
extension_service_ =
extensions::ExtensionSystem::Get(GetProfile())->extension_service();
}
void TearDown() override { extension_service_ = nullptr; }
base::FilePath GetProductProfilePath(const std::string& product) {
return brave_profile_dir_.GetPath()
.AppendASCII("extensions")
@@ -131,10 +127,6 @@ class BraveExternalProcessImporterHostUnitTest : public testing::Test {
.AppendASCII(id);
}
extensions::ExtensionService* extension_service() {
return extension_service_.get();
}
void AddExtension(const std::string& id) {
auto extension = extensions::ExtensionBuilder()
.SetManifest(base::Value::Dict()
@@ -144,7 +136,8 @@ class BraveExternalProcessImporterHostUnitTest : public testing::Test {
.SetID(id)
.Build();
ASSERT_TRUE(extension);
extension_service()->AddExtension(extension.get());
extensions::ExtensionRegistrar::Get(GetProfile())
->AddExtension(extension.get());
}
Profile* GetProfile() { return profile_.get(); }
@@ -185,7 +178,6 @@ class BraveExternalProcessImporterHostUnitTest : public testing::Test {
base::ScopedTempDir brave_profile_dir_;
std::unique_ptr<TestingProfile> profile_;
raw_ptr<extensions::ExtensionService> extension_service_ = nullptr;
};
TEST_F(BraveExternalProcessImporterHostUnitTest, ImportEtensionsSettings) {
@@ -76,9 +76,8 @@ class BraveExtensionsManifestV2BrowserTest : public InProcessBrowserTest {
void SimulateInstall() {
scoped_refptr<const extensions::Extension> extension(
extensions::ExtensionBuilder("extension").SetID(kExtensionId).Build());
extensions::ExtensionSystem::Get(browser()->profile())
->extension_service()
->AddExtension(extension.get());
extensions::ExtensionRegistrar::Get(browser()->profile())
->AddExtension(extension);
}
void EnableExtension(bool enable) {
@@ -61,9 +61,8 @@ class TorSnowflakeExtensionBrowserTest : public InProcessBrowserTest {
extensions::ExtensionBuilder("Snowflake")
.SetID(kSnowflakeExtensionId)
.Build());
extensions::ExtensionSystem::Get(browser()->profile())
->extension_service()
->AddExtension(extension.get());
extensions::ExtensionRegistrar::Get(browser()->profile())
->AddExtension(extension);
}
void EnableSnowflake(bool enable) {
@@ -347,9 +347,8 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest,
extensions::ExtensionBuilder("MetaMask")
.SetID(kMetamaskExtensionId)
.Build());
extensions::ExtensionSystem::Get(browser()->profile())
->extension_service()
->AddExtension(extension.get());
extensions::ExtensionRegistrar::Get(browser()->profile())
->AddExtension(extension);
brave_wallet::SetDefaultEthereumWallet(
browser()->profile()->GetPrefs(),
@@ -378,9 +377,8 @@ IN_PROC_BROWSER_TEST_F(JSEthereumProviderBrowserTest,
extensions::ExtensionBuilder("MetaMask")
.SetID(kMetamaskExtensionId)
.Build());
extensions::ExtensionSystem::Get(browser()->profile())
->extension_service()
->AddExtension(extension.get());
extensions::ExtensionRegistrar::Get(browser()->profile())
->AddExtension(extension);
brave_wallet::SetDefaultEthereumWallet(
browser()->profile()->GetPrefs(),