1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig
+++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
@@ -28,7 +28,6 @@ namespace extensions {
bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
const char* const kAllowed[] = {
- extension_misc::kInAppPaymentsSupportAppId,
extension_misc::kPdfExtensionId,
#if defined(OS_CHROMEOS)
extension_misc::kAssessmentAssistantExtensionId,
--- chrome/browser/extensions/component_loader.cc.orig
+++ chrome/browser/extensions/component_loader.cc
@@ -354,11 +354,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
-
- AddWithNameAndDescription(
- IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
- l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -495,18 +490,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
#endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
- bool install_feedback = enable_background_extensions_during_testing;
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- install_feedback = true;
-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
- if (install_feedback) {
- AddWithNameAndDescription(
- IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")),
- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_APP_TITLE),
- // Description string
- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_PAGE_TITLE));
- }
-
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (command_line->HasSwitch(switches::kLoadGuestModeTestExtension)) {
base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII(
--- chrome/browser/extensions/external_component_loader.cc.orig
+++ chrome/browser/extensions/external_component_loader.cc
@@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
auto prefs = std::make_unique<base::DictionaryValue>();
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#if defined(OS_CHROMEOS)
{
--- chrome/browser/extensions/webstore_installer.cc.orig
+++ chrome/browser/extensions/webstore_installer.cc
@@ -555,20 +555,6 @@ void WebstoreInstaller::DownloadNextPend
void WebstoreInstaller::DownloadCrx(
const std::string& extension_id,
InstallSource source) {
- download_url_ = GetWebstoreInstallURL(extension_id, source);
- MaybeAppendAuthUserParameter(approval_->authuser, &download_url_);
-
- base::FilePath user_data_dir;
- base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
- base::FilePath download_path = user_data_dir.Append(kWebstoreDownloadFolder);
-
- base::FilePath download_directory(g_download_directory_for_tests ?
- *g_download_directory_for_tests : download_path);
-
- base::PostTaskAndReplyWithResult(
- GetExtensionFileTaskRunner().get(), FROM_HERE,
- base::BindOnce(&GetDownloadFilePath, download_directory, extension_id),
- base::BindOnce(&WebstoreInstaller::StartDownload, this, extension_id));
}
// http://crbug.com/165634
@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!crx_installer_.get());
-
- ExtensionService* service = ExtensionSystem::Get(profile_)->
- extension_service();
- CHECK(service);
-
- const Approval* approval = GetAssociatedApproval(download);
- DCHECK(approval);
-
- crx_installer_ = download_crx_util::CreateCrxInstaller(profile_, download);
-
- crx_installer_->set_expected_id(approval->extension_id);
- crx_installer_->set_is_gallery_install(true);
- crx_installer_->set_allow_silent_install(true);
-
- crx_installer_->InstallCrx(download.GetFullPath());
}
void WebstoreInstaller::ReportFailure(const std::string& error,
|
