0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Release 95.0.4638.79

Browse source
This commit is contained in:
csagan5 2021-11-17 18:45:34 +01:00 • committed by Yifeng Wu
parent faf7c24f98
commit abb862704c
6 changed files with 196 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
CHANGELOG.md
View file

@ -1,36 +1,3 @@
# 98.0.4758.108
* re-introduce flag for text fragments
* re-introduce content feature flag to disable field trials
* disable idle detection
* disable critical client hints
* disable supervised users
* partial fix for incognito notification (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1503)
* consider websockets 'unknown' address space as 'public' (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1693)
* fix crash when accessing site settings of some sites (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1355)
# 97.0.4692.106
* disable url-keyed metrics reporting service (thanks to @uazo)
* disable mobile identity consistency by default
* disable appending variations header
* use Google Chrome branding for client hints
* make HTTPS-only mode enabled by default
* enable trivial auto var init (thanks to @BayLee4, fixes https://github.com/bromite/bromite/issues/1749)
* enable use_cfi_cast
# 96.0.4664.183
* updated zh_CN translations (thanks to @zhmars)
# 96.0.4664.104
* separate patches for package name
# 96.0.4664.54
* restored offline-indicator-v2 flag (fixes https://github.com/bromite/bromite/issues/1588)
* re-introduced option to use home page as NTP (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1519)
* ask user before closing all tabs (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1561)
* fix crash on always incognito on tablet (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1611)
* dropped patch to not upload crash data
* fix autofill pop-up not appearing (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1534)
# 95.0.4638.79
* improvements for field trials disable patch (thanks to @uazo)
* remove privacy sandbox UI leftover (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1560)

3
build/bromite_patches_list.txt
View file

@ -164,4 +164,7 @@ Keep-empty-tabs-between-sessions.patch
Disable-third-party-origin-trials.patch
Never-use-HTTP-probes-for-connection-detection.patch
Disable-Accessibility-service-by-default.patch
Disable-privacy-sandbox.patch
Disable-conversion-measurement-api.patch
Disable-FLoC.patch
Automated-domain-substitution.patch

4
build/patches/Automated-domain-substitution.patch
View file

@ -13010,7 +13010,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
--- a/components/history/core/browser/history_service.cc
+++ b/components/history/core/browser/history_service.cc
@@ -1247,7 +1247,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween(
@@ -1242,7 +1242,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween(
semantics {
description:
"If a user who syncs their browsing history deletes history "
@ -13019,7 +13019,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
"host to execute the corresponding deletion serverside."
trigger:
"Deleting browsing history for a given time range, e.g. from the "
@@ -1289,7 +1289,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history,
@@ -1284,7 +1284,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history,
semantics {
description:
"If a user who syncs their browsing history deletes urls from "

149
build/patches/Bromite-AdBlockUpdaterService.patch
View file

@ -25,6 +25,7 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681)
chrome/browser/browser_process_impl.cc | 20 ++
chrome/browser/browser_process_impl.h | 2 +
chrome/browser/chrome_browser_main.cc | 2 +
.../browser/chrome_content_browser_client.cc | 15 -
.../flags/android/cached_feature_flags.cc | 11 +
.../browser/flags/CachedFeatureFlags.java | 10 +
.../net/system_network_context_manager.cc | 4 +
@ -33,10 +34,10 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681)
chrome/common/pref_names.cc | 3 +
chrome/common/pref_names.h | 1 +
components/component_updater/BUILD.gn | 7 +
.../adblock_updater_service.cc | 271 ++++++++++++++++++
.../adblock_updater_service.cc | 272 ++++++++++++++++++
.../adblock_updater_service.h | 99 +++++++
.../download_filters_task.cc | 224 +++++++++++++++
.../component_updater/download_filters_task.h | 130 +++++++++
.../component_updater/download_filters_task.h | 129 +++++++++
...ent_subresource_filter_throttle_manager.cc | 11 +
.../content/browser/ruleset_service.cc | 33 ++-
.../content/browser/ruleset_service.h | 7 +-
@ -45,7 +46,7 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681)
.../browser/subresource_filter_features.cc | 113 +-------
.../core/common/indexed_ruleset.cc | 5 +-
.../navigation_throttle_runner.cc | 5 -
36 files changed, 1157 insertions(+), 124 deletions(-)
37 files changed, 1157 insertions(+), 139 deletions(-)
create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@ -58,7 +59,7 @@ Fix RestoreForeignSessionTab by recreating the tab (issue #681)
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -560,6 +560,7 @@ chrome_java_resources = [
@@ -564,6 +564,7 @@ chrome_java_resources = [
"java/res/layout/account_chooser_dialog_title.xml",
"java/res/layout/account_divider_preference.xml",
"java/res/layout/account_management_account_row.xml",
@ -66,7 +67,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
"java/res/layout/auto_sign_in_first_run_dialog.xml",
"java/res/layout/autofill_billing_address_dropdown.xml",
"java/res/layout/autofill_card_unmask_prompt.xml",
@@ -773,6 +774,7 @@ chrome_java_resources = [
@@ -776,6 +777,7 @@ chrome_java_resources = [
"java/res/xml/about_chrome_preferences.xml",
"java/res/xml/accessibility_preferences.xml",
"java/res/xml/account_management_preferences.xml",
@ -77,9 +78,9 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -978,6 +978,8 @@ chrome_java_sources = [
@@ -990,6 +990,8 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/payments/ui/ShoppingCart.java",
"java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
"java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
"java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
+ "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
+ "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
@ -161,7 +162,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
--- a/chrome/android/java/res/values/styles.xml
+++ b/chrome/android/java/res/values/styles.xml
@@ -198,6 +198,24 @@
@@ -199,6 +199,24 @@
</item>
</style>
@ -409,7 +410,7 @@ new file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
@@ -802,7 +802,7 @@ public class TabModelImpl extends TabModelJniBridge {
@@ -801,7 +801,7 @@ public class TabModelImpl extends TabModelJniBridge {
Tab parent, Profile profile, WebContents webContents) {
return getTabCreator(profile.isOffTheRecord())
.createTabWithWebContents(
@ -421,7 +422,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11157,6 +11157,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10853,6 +10853,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
Never show this again.
</message>
@ -441,16 +442,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
--- a/chrome/browser/after_startup_task_utils.cc
+++ b/chrome/browser/after_startup_task_utils.cc
@@ -33,6 +33,8 @@
#include "chromeos/lacros/lacros_service.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -26,6 +26,8 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
+#include "chrome/browser/browser_process.h"
+
using content::BrowserThread;
namespace {
@@ -128,6 +130,9 @@ void SetBrowserStartupIsComplete() {
@@ -121,6 +123,9 @@ void SetBrowserStartupIsComplete() {
g_after_startup_tasks.Get().clear();
g_after_startup_tasks.Get().shrink_to_fit();
@ -463,7 +464,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -21,6 +21,7 @@
@@ -22,6 +22,7 @@
#include "build/chromeos_buildflags.h"
#include "chrome/common/buildflags.h"
#include "media/media_buildflags.h"
@ -471,7 +472,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
class BackgroundModeManager;
class BrowserProcessPlatformPart;
@@ -69,6 +70,10 @@ namespace component_updater {
@@ -71,6 +72,10 @@ namespace component_updater {
class ComponentUpdateService;
}
@ -482,7 +483,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
namespace extensions {
class EventRouterForwarder;
}
@@ -237,6 +242,7 @@ class BrowserProcess {
@@ -238,6 +243,7 @@ class BrowserProcess {
#endif
virtual component_updater::ComponentUpdateService* component_updater() = 0;
@ -493,7 +494,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1068,6 +1068,26 @@ BrowserProcessImpl::component_updater() {
@@ -1070,6 +1070,26 @@ BrowserProcessImpl::component_updater() {
return component_updater_.get();
}
@ -523,7 +524,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -203,6 +203,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -200,6 +200,7 @@ class BrowserProcessImpl : public BrowserProcess,
#endif
component_updater::ComponentUpdateService* component_updater() override;
@ -531,7 +532,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
MediaFileSystemRegistry* media_file_system_registry() override;
WebRtcLogUploader* webrtc_log_uploader() override;
network_time::NetworkTimeTracker* network_time_tracker() override;
@@ -385,6 +386,7 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -386,6 +387,7 @@ class BrowserProcessImpl : public BrowserProcess,
// to concerns over integrity of data shared between profiles,
// but some users of component updater only install per-user.
std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@ -542,15 +543,54 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1714,6 +1714,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
browser_process_->StartAutoupdateTimer();
#endif // defined(OS_WIN) || (defined(OS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS))
@@ -1649,6 +1649,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
speech::SodaInstaller::GetInstance()->Init(profile_->GetPrefs(),
browser_process_->local_state());
#endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
+ // force AdBlock updater initialisation
+ g_browser_process->adblock_updater();
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -61,7 +61,6 @@
#include "chrome/browser/hid/chrome_hid_delegate.h"
#include "chrome/browser/interstitials/enterprise_util.h"
#include "chrome/browser/lifetime/browser_shutdown.h"
-#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
#include "chrome/browser/media/audio_service_util.h"
#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
@@ -3916,16 +3915,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
content::NavigationHandle* handle) {
std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
- // MetricsNavigationThrottle requires that it runs before NavigationThrottles
- // that may delay or cancel navigations, so only NavigationThrottles that
- // don't delay or cancel navigations (e.g. throttles that are only observing
- // callbacks without affecting navigation behavior) should be added before
- // MetricsNavigationThrottle.
- if (handle->IsInMainFrame()) {
- throttles.push_back(
- page_load_metrics::MetricsNavigationThrottle::Create(handle));
- }
-
#if BUILDFLAG(IS_CHROMEOS_ASH)
MaybeAddThrottle(
ash::WebTimeLimitNavigationThrottle::MaybeCreateThrottleFor(handle),
@@ -4027,10 +4016,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
- MaybeAddThrottle(
- LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(handle),
- &throttles);
-
MaybeAddThrottle(PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
#if BUILDFLAG(ENABLE_PDF)
diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/browser/flags/android/cached_feature_flags.cc
--- a/chrome/browser/flags/android/cached_feature_flags.cc
+++ b/chrome/browser/flags/android/cached_feature_flags.cc
@ -579,7 +619,7 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -270,6 +270,14 @@ public class CachedFeatureFlags {
@@ -264,6 +264,14 @@ public class CachedFeatureFlags {
ChromeFeatureList.isEnabled(ChromeFeatureList.BACKGROUND_THREAD_POOL));
}
@ -594,7 +634,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
/**
* Caches flags that must take effect on startup but are set via native code.
*/
@@ -487,5 +495,7 @@ public class CachedFeatureFlags {
@@ -469,5 +477,7 @@ public class CachedFeatureFlags {
@NativeMethods
interface Natives {
boolean isNetworkServiceWarmUpEnabled();
@ -605,7 +645,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -343,6 +343,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
@@ -348,6 +348,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
SSLConfigServiceManager::CreateDefaultManager(local_state_)),
proxy_config_monitor_(local_state_),
stub_resolver_config_reader_(local_state_) {
@ -614,7 +654,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
#if !defined(OS_ANDROID)
// QuicAllowed was not part of Android policy.
const base::Value* value =
@@ -413,6 +415,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
@@ -418,6 +420,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
StubResolverConfigReader::RegisterPrefs(registry);
@ -664,7 +704,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -2252,6 +2252,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
@@ -2194,6 +2194,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
// capture devices without prompt.
const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
@ -701,8 +741,8 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
"component_updater_service.cc",
"component_updater_service.h",
"component_updater_service_internal.h",
@@ -37,6 +43,7 @@ static_library("component_updater") {
"//components/prefs",
@@ -36,6 +42,7 @@ static_library("component_updater") {
"//components/crx_file",
"//components/update_client",
"//components/version_info",
+ "//services/network/public/mojom",
@ -713,7 +753,7 @@ diff --git a/components/component_updater/adblock_updater_service.cc b/component
new file mode 100644
--- /dev/null
+++ b/components/component_updater/adblock_updater_service.cc
@@ -0,0 +1,271 @@
@@ -0,0 +1,272 @@
+/*
+ This file is part of Bromite.
+
@ -744,6 +784,7 @@ new file mode 100644
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "base/threading/thread_checker.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
@ -803,8 +844,8 @@ new file mode 100644
+ << next_check_delay << " seconds. ";
+
+ scheduler_->Schedule(
+ base::Seconds(initial_check_delay),
+ base::Seconds(next_check_delay),
+ base::TimeDelta::FromSeconds(initial_check_delay),
+ base::TimeDelta::FromSeconds(next_check_delay),
+ base::BindRepeating(&AdBlockUpdaterService::OnDemandScheduledUpdate,
+ base::Unretained(this)), base::DoNothing());
+}
@ -825,7 +866,7 @@ new file mode 100644
+ if (!last_update_.is_null()) {
+ base::TimeDelta delta =
+ base::TimeTicks::Now() - last_update_;
+ if (delta < base::Seconds(on_demand_check_delay)) {
+ if (delta < base::TimeDelta::FromSeconds(on_demand_check_delay)) {
+ LOG(INFO) << "AdBlockUpdaterService: update not necessary.";
+ return false;
+ }
@ -892,7 +933,7 @@ new file mode 100644
+ if (!failed) {
+ base::TimeDelta delta =
+ base::Time::Now() - min_last_modified;
+ if (delta < base::Seconds(on_demand_check_delay)) {
+ if (delta < base::TimeDelta::FromSeconds(on_demand_check_delay)) {
+ LOG(INFO) << "AdBlockUpdaterService: update check not yet needed.";
+ is_updating_ = false;
+ return false;
@ -1322,7 +1363,7 @@ diff --git a/components/component_updater/download_filters_task.h b/components/c
new file mode 100644
--- /dev/null
+++ b/components/component_updater/download_filters_task.h
@@ -0,0 +1,130 @@
@@ -0,0 +1,129 @@
+/*
+ This file is part of Bromite.
+
@ -1347,6 +1388,7 @@ new file mode 100644
+#include <vector>
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/threading/thread_checker.h"
+#include "components/update_client/network.h"
@ -1396,9 +1438,6 @@ new file mode 100644
+// Defines a specialized task for updating AdBlock filters.
+class DownloadFiltersTask : public base::RefCounted<DownloadFiltersTask> {
+ public:
+ DownloadFiltersTask(const DownloadFiltersTask&) = delete;
+ DownloadFiltersTask& operator=(const DownloadFiltersTask&) = delete;
+
+ using Callback =
+ base::OnceCallback<void(scoped_refptr<DownloadFiltersTask> task, Error error)>;
+
@ -1448,6 +1487,7 @@ new file mode 100644
+ base::FilePath file_path_;
+
+ friend class base::RefCounted<DownloadFiltersTask>;
+ DISALLOW_COPY_AND_ASSIGN(DownloadFiltersTask);
+};
+
+} // namespace update_client
@ -1456,7 +1496,7 @@ new file mode 100644
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
--- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
@@ -652,6 +652,17 @@ ContentSubresourceFilterThrottleManager::
@@ -651,6 +651,17 @@ ContentSubresourceFilterThrottleManager::
throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
ad_tagging_state);
}
@ -1477,7 +1517,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc
--- a/components/subresource_filter/content/browser/ruleset_service.cc
+++ b/components/subresource_filter/content/browser/ruleset_service.cc
@@ -46,9 +46,7 @@ namespace {
@@ -47,9 +47,7 @@ namespace {
void RecordIndexAndWriteRulesetResult(
RulesetService::IndexAndWriteRulesetResult result) {
@ -1592,7 +1632,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
diff --git a/components/subresource_filter/content/browser/ruleset_service.h b/components/subresource_filter/content/browser/ruleset_service.h
--- a/components/subresource_filter/content/browser/ruleset_service.h
+++ b/components/subresource_filter/content/browser/ruleset_service.h
@@ -184,7 +184,7 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
@@ -180,7 +180,7 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
//
// Virtual so that it can be mocked out in tests.
virtual void IndexAndStoreAndPublishRulesetIfNeeded(
@ -1601,7 +1641,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.h b/c
// Get the ruleset version associated with the current local_state_.
IndexedRulesetVersion GetMostRecentlyIndexedVersion() const;
@@ -217,6 +217,11 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
@@ -213,6 +213,11 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
const base::FilePath& indexed_ruleset_base_dir,
const UnindexedRulesetInfo& unindexed_ruleset_info);
@ -1637,7 +1677,7 @@ diff --git a/components/subresource_filter/content/browser/verified_ruleset_deal
+#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/task/task_runner_util.h"
#include "base/task_runner_util.h"
@@ -39,6 +40,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
"VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
@ -1651,8 +1691,8 @@ diff --git a/components/subresource_filter/content/browser/verified_ruleset_deal
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
--- a/components/subresource_filter/core/browser/subresource_filter_features.cc
+++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
@@ -55,69 +55,7 @@ class CommaSeparatedStrings {
const std::vector<base::StringPiece> pieces_;
@@ -54,69 +54,7 @@ class CommaSeparatedStrings {
DISALLOW_COPY_AND_ASSIGN(CommaSeparatedStrings);
};
-std::string TakeVariationParamOrReturnEmpty(
@ -1722,7 +1762,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
// If ad tagging is enabled, turn on the dryrun automatically.
bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
const struct {
@@ -125,23 +63,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
@@ -124,23 +62,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
bool enabled_by_default;
Configuration (*factory_method)();
} kAvailablePresetConfigurations[] = {
@ -1748,7 +1788,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
enabled_configurations.push_back(available_preset.factory_method());
}
}
@@ -149,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
@@ -148,46 +79,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
return enabled_configurations;
}
@ -1822,7 +1862,7 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
diff --git a/content/browser/renderer_host/navigation_throttle_runner.cc b/content/browser/renderer_host/navigation_throttle_runner.cc
--- a/content/browser/renderer_host/navigation_throttle_runner.cc
+++ b/content/browser/renderer_host/navigation_throttle_runner.cc
@@ -184,11 +184,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
@@ -180,11 +180,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
// than other throttles that might care about those navigations, e.g.
// throttles handling pages with 407 errors that require extra authentication.
AddThrottle(HttpErrorNavigationThrottle::MaybeCreateThrottleFor(*request));
@ -1834,5 +1874,6 @@ diff --git a/content/browser/renderer_host/navigation_throttle_runner.cc b/conte
}
NavigationThrottle* NavigationThrottleRunner::GetDeferringThrottle() const {
--
2.25.1
--
2.20.1

119
build/patches/Disable-FLoC.patch
View file

@ -18,18 +18,17 @@ Also added the disabling of blink features through the DisabledForBromite tag
components/history/core/browser/url_row.h | 1 -
third_party/blink/common/features.cc | 4 +-
.../permissions_policy_feature.mojom | 5 --
.../renderer/bindings/generated_in_core.gni | 2 -
.../blink/renderer/core/dom/document.cc | 31 +---------
.../blink/renderer/core/dom/document.cc | 3 +-
.../blink/renderer/core/dom/document.idl | 1 -
.../renderer/core/dom/interest_cohort.idl | 4 --
.../permissions_policy_features.json5 | 6 --
.../platform/runtime_enabled_features.json5 | 5 +-
18 files changed, 38 insertions(+), 164 deletions(-)
17 files changed, 38 insertions(+), 134 deletions(-)
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2798,6 +2798,10 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed(
@@ -2674,6 +2674,10 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed(
const url::Origin* impression_origin,
const url::Origin* conversion_origin,
const url::Origin* reporting_origin) {
@ -43,7 +42,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/component_updater/floc_component_installer.cc b/chrome/browser/component_updater/floc_component_installer.cc
--- a/chrome/browser/component_updater/floc_component_installer.cc
+++ b/chrome/browser/component_updater/floc_component_installer.cc
@@ -19,7 +19,7 @@ namespace component_updater {
@@ -18,7 +18,7 @@ namespace component_updater {
// The extension id is: cmahhnpholdijhjokonmfdjbfmklppij
constexpr uint8_t kFlocComponentPublicKeySHA256[32] = {
0x2c, 0x07, 0x7d, 0xf7, 0xeb, 0x38, 0x97, 0x9e, 0xae, 0xdc, 0x53,
@ -52,9 +51,9 @@ diff --git a/chrome/browser/component_updater/floc_component_installer.cc b/chro
0x8f, 0x68, 0x3a, 0xf9, 0x21, 0x91, 0x9f, 0xc1, 0x84, 0xa1};
constexpr char kFlocComponentFetcherManifestName[] =
@@ -56,10 +56,6 @@ void FlocComponentInstallerPolicy::ComponentReady(
@@ -55,10 +55,6 @@ void FlocComponentInstallerPolicy::ComponentReady(
const base::FilePath& install_dir,
base::Value manifest) {
std::unique_ptr<base::DictionaryValue> manifest) {
DCHECK(!install_dir.empty());
-
- floc_sorting_lsh_clusters_service_->OnSortingLshClustersFileReady(
@ -63,7 +62,7 @@ diff --git a/chrome/browser/component_updater/floc_component_installer.cc b/chro
}
// Called during startup and installation before ComponentReady().
@@ -102,10 +98,6 @@ void RegisterFlocComponent(
@@ -101,10 +97,6 @@ void RegisterFlocComponent(
ComponentUpdateService* cus,
federated_learning::FlocSortingLshClustersService*
floc_sorting_lsh_clusters_service) {
@ -77,7 +76,7 @@ diff --git a/chrome/browser/component_updater/floc_component_installer.cc b/chro
diff --git a/chrome/browser/federated_learning/floc_eligibility_observer.cc b/chrome/browser/federated_learning/floc_eligibility_observer.cc
--- a/chrome/browser/federated_learning/floc_eligibility_observer.cc
+++ b/chrome/browser/federated_learning/floc_eligibility_observer.cc
@@ -17,55 +17,14 @@
@@ -16,55 +16,14 @@
namespace federated_learning {
@ -136,8 +135,8 @@ diff --git a/chrome/browser/federated_learning/floc_eligibility_observer.cc b/ch
}
void FlocEligibilityObserver::OnAdResource() {
@@ -86,17 +45,6 @@ FlocEligibilityObserver::FlocEligibilityObserver(content::RenderFrameHost* rfh)
web_contents_(content::WebContents::FromRenderFrameHost(rfh)) {}
@@ -84,17 +43,6 @@ FlocEligibilityObserver::FlocEligibilityObserver(content::RenderFrameHost* rfh)
: web_contents_(content::WebContents::FromRenderFrameHost(rfh)) {}
void FlocEligibilityObserver::OnOptInSignalObserved() {
- if (!eligible_commit_ || observed_opt_in_signal_)
@ -153,7 +152,7 @@ diff --git a/chrome/browser/federated_learning/floc_eligibility_observer.cc b/ch
- observed_opt_in_signal_ = true;
}
DOCUMENT_USER_DATA_KEY_IMPL(FlocEligibilityObserver);
RENDER_DOCUMENT_HOST_USER_DATA_KEY_IMPL(FlocEligibilityObserver)
diff --git a/chrome/browser/federated_learning/floc_id_provider_impl.cc b/chrome/browser/federated_learning/floc_id_provider_impl.cc
--- a/chrome/browser/federated_learning/floc_id_provider_impl.cc
+++ b/chrome/browser/federated_learning/floc_id_provider_impl.cc
@ -172,7 +171,7 @@ diff --git a/chrome/browser/federated_learning/floc_id_provider_impl.cc b/chrome
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc
@@ -181,6 +181,9 @@ PrivacySandboxSettings::PrivacySandboxSettings(
@@ -182,6 +182,9 @@ PrivacySandboxSettings::PrivacySandboxSettings(
// as default, privacy sandbox is disabled
pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, false);
@ -182,7 +181,7 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc b/chrome
// On first entering the privacy sandbox experiment, users may have the
// privacy sandbox disabled (or "reconciled") based on their current cookie
// settings (e.g. blocking 3P cookies). Depending on the state of the sync
@@ -291,7 +294,8 @@ bool PrivacySandboxSettings::IsFlocPrefEnabled() const {
@@ -301,7 +304,8 @@ bool PrivacySandboxSettings::IsFlocPrefEnabled() const {
}
void PrivacySandboxSettings::SetFlocPrefEnabled(bool enabled) const {
@ -192,7 +191,7 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc b/chrome
base::RecordAction(base::UserMetricsAction(
enabled ? "Settings.PrivacySandbox.FlocEnabled"
: "Settings.PrivacySandbox.FlocDisabled"));
@@ -444,6 +448,7 @@ void PrivacySandboxSettings::MaybeReconcilePrivacySandboxPref() {
@@ -454,6 +458,7 @@ void PrivacySandboxSettings::MaybeReconcilePrivacySandboxPref() {
// this code could be eliminated in the future, as initially
// the feauture was tied to the cookies flag
pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, false);
@ -200,7 +199,7 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc b/chrome
if((true))
return;
@@ -542,11 +547,8 @@ void PrivacySandboxSettings::ReconcilePrivacySandboxPref() {
@@ -552,11 +557,8 @@ void PrivacySandboxSettings::ReconcilePrivacySandboxPref() {
void PrivacySandboxSettings::SetFlocDataAccessibleFromNow(
bool reset_calculate_timer) const {
@ -233,7 +232,7 @@ diff --git a/components/federated_learning/features/features.cc b/components/fed
// If enabled, pages that had ad resources will be included in floc computation;
// otherwise, only pages that used the document.interestCohort API will be
@@ -27,18 +27,18 @@ const base::Feature kFlocIdComputedEventLogging{
@@ -27,19 +27,19 @@ const base::Feature kFlocIdComputedEventLogging{
// criteria.
const base::Feature kFlocPagesWithAdResourcesDefaultIncludedInFlocComputation{
"FlocPagesWithAdResourcesDefaultIncludedInFlocComputation",
@ -248,8 +247,9 @@ diff --git a/components/federated_learning/features/features.cc b/components/fed
- "FederatedLearningOfCohorts", base::FEATURE_DISABLED_BY_DEFAULT};
+ "FederatedLearningOfCohorts", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
constexpr base::FeatureParam<base::TimeDelta> kFlocIdScheduledUpdateInterval{
- &kFederatedLearningOfCohorts, "update_interval", base::Days(7)};
+ &kFederatedLearningOfCohorts, "update_interval", base::Days(1)};
&kFederatedLearningOfCohorts, "update_interval",
- base::TimeDelta::FromDays(7)};
+ base::TimeDelta::FromDays(1)};
constexpr base::FeatureParam<int> kFlocIdMinimumHistoryDomainSizeRequired{
- &kFederatedLearningOfCohorts, "minimum_history_domain_size_required", 3};
+ &kFederatedLearningOfCohorts, "minimum_history_domain_size_required", 99999};
@ -302,7 +302,7 @@ diff --git a/components/federated_learning/floc_id.cc b/components/federated_lea
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
@@ -486,18 +486,7 @@ void HistoryBackend::SetFlocAllowed(ContextID context_id,
@@ -463,18 +463,7 @@ void HistoryBackend::SetFlocAllowed(ContextID context_id,
if (!visit_id)
return;
@ -362,7 +362,7 @@ diff --git a/components/history/core/browser/url_row.h b/components/history/core
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -890,11 +890,11 @@ const base::Feature kSendCnameAliasesToSubresourceFilterFromRenderer{
@@ -883,11 +883,11 @@ const base::Feature kDeclarativeShadowDOM{"DeclarativeShadowDOM",
// API exposure will be disabled regardless of the OT config.
// (See https://github.com/WICG/floc.)
const base::Feature kInterestCohortAPIOriginTrial{
@ -374,12 +374,12 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
- "InterestCohortFeaturePolicy", base::FEATURE_DISABLED_BY_DEFAULT};
+ "InterestCohortFeaturePolicy", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
const base::Feature kDisableDocumentDomainByDefault{
"DisableDocumentDomainByDefault", base::FEATURE_DISABLED_BY_DEFAULT};
// Changes the default background color of the Text Fragment from
// bright yellow rgb(255, 255, 0) to light purple rgb(233, 210, 253)
diff --git a/third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom b/third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom
--- a/third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom
+++ b/third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom
@@ -125,11 +125,6 @@ enum PermissionsPolicyFeature {
@@ -126,11 +126,6 @@ enum PermissionsPolicyFeature {
// Controls access to screen capture via getDisplayMedia().
kDisplayCapture = 81,
@ -391,30 +391,10 @@ diff --git a/third_party/blink/public/mojom/permissions_policy/permissions_polic
// Controls whether Autofill may fill fields in that frame when triggered on
// a field with the main frame's origin.
kSharedAutofill = 83,
diff --git a/third_party/blink/renderer/bindings/generated_in_core.gni b/third_party/blink/renderer/bindings/generated_in_core.gni
--- a/third_party/blink/renderer/bindings/generated_in_core.gni
+++ b/third_party/blink/renderer/bindings/generated_in_core.gni
@@ -203,8 +203,6 @@ generated_dictionary_sources_in_core = [
"$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_input_device_capabilities_init.h",
"$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_input_event_init.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_input_event_init.h",
- "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_interest_cohort.cc",
- "$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_interest_cohort.h",
"$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_intersection_observer_init.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_intersection_observer_init.h",
"$root_gen_dir/third_party/blink/renderer/bindings/core/v8/v8_intrinsic_sizes_result_options.cc",
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -79,7 +79,6 @@
#include "third_party/blink/renderer/bindings/core/v8/source_location.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_element_creation_options.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_element_registration_options.h"
-#include "third_party/blink/renderer/bindings/core/v8/v8_interest_cohort.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_throw_dom_exception.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_union_elementcreationoptions_string.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_union_htmlscriptelement_svgscriptelement.h"
@@ -6043,8 +6042,7 @@ ScriptPromise Document::interestCohort(ScriptState* script_state,
@@ -6009,8 +6009,7 @@ ScriptPromise Document::interestCohort(ScriptState* script_state,
return ScriptPromise();
}
@ -424,44 +404,10 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
exception_state.ThrowDOMException(
DOMExceptionCode::kInvalidAccessError,
"The \"interest-cohort\" Permissions Policy denied the use of "
@@ -6056,33 +6054,6 @@ ScriptPromise Document::interestCohort(ScriptState* script_state,
MakeGarbageCollected<ScriptPromiseResolver>(script_state);
ScriptPromise promise = resolver->Promise();
-
- GetFlocService(ExecutionContext::From(script_state))
- ->GetInterestCohort(WTF::Bind(
- [](ScriptPromiseResolver* resolver, Document* document,
- mojom::blink::InterestCohortPtr interest_cohort) {
- DCHECK(resolver);
- DCHECK(document);
-
- if (interest_cohort->version.IsEmpty()) {
- ScriptState* state = resolver->GetScriptState();
- ScriptState::Scope scope(state);
-
- resolver->Reject(V8ThrowDOMException::CreateOrEmpty(
- state->GetIsolate(), DOMExceptionCode::kDataError,
- "Failed to get the interest cohort: either it is "
- "unavailable, or preferences or content settings have "
- "denied access."));
- } else {
- InterestCohort* result = InterestCohort::Create();
- result->setId(interest_cohort->id);
- result->setVersion(interest_cohort->version);
-
- resolver->Resolve(result);
- }
- },
- WrapPersistent(resolver), WrapPersistent(this)));
-
return promise;
}
diff --git a/third_party/blink/renderer/core/dom/document.idl b/third_party/blink/renderer/core/dom/document.idl
--- a/third_party/blink/renderer/core/dom/document.idl
+++ b/third_party/blink/renderer/core/dom/document.idl
@@ -193,7 +193,6 @@ typedef (HTMLScriptElement or SVGScriptElement) HTMLOrSVGScriptElement;
@@ -190,7 +190,6 @@ typedef (HTMLScriptElement or SVGScriptElement) HTMLOrSVGScriptElement;
// Interest Cohort API
// TODO(yaoxia): Add web tests. http://crbug/1130074.
@ -483,7 +429,7 @@ diff --git a/third_party/blink/renderer/core/dom/interest_cohort.idl b/third_par
diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
--- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
+++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
@@ -240,12 +240,6 @@
@@ -256,12 +256,6 @@
permissions_policy_name: "idle-detection",
depends_on: ["IdleDetection"],
},
@ -494,12 +440,12 @@ diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_poli
- depends_on: ["InterestCohortFeaturePolicy"],
- },
{
name: "JoinAdInterestGroup",
permissions_policy_name: "join-ad-interest-group",
name: "Magnetometer",
permissions_policy_name: "magnetometer",
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1259,12 +1259,11 @@
@@ -1216,12 +1216,11 @@
},
{
name: "InterestCohortAPI",
@ -514,5 +460,6 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
},
{
name: "IntersectionObserverDocumentScrollingElementRoot",
--
2.25.1
--
2.20.1

126
build/patches/Disable-conversion-measurement-api.patch
View file

@ -14,23 +14,23 @@ being sent and being saved to disk, although it is currently in uncalled code.
.../embedder_support/origin_trials/features.cc | 3 ++-
.../render_view_context_menu_base.cc | 3 ---
.../browser/android/navigation_handle_proxy.cc | 10 ----------
.../attribution_reporting/attribution_host.cc | 8 --------
.../attribution_reporting/attribution_host.h | 3 ---
.../attribution_host_utils.cc | 6 ++++++
.../attribution_network_sender_impl.cc | 17 ++++++++++-------
.../attribution_storage_sql.cc | 2 +-
.../navigation_controller_android.cc | 16 ----------------
content/browser/conversions/conversion_host.cc | 8 --------
content/browser/conversions/conversion_host.h | 3 ---
.../conversions/conversion_host_utils.cc | 6 ++++++
.../conversion_network_sender_impl.cc | 17 ++++++++++-------
.../conversions/conversion_storage_sql.cc | 2 +-
.../navigation_controller_android.cc | 15 ---------------
content/browser/storage_partition_impl.cc | 7 +------
.../browser/AttributionReporterImpl.java | 4 ----
content/public/browser/navigation_controller.cc | 1 -
third_party/blink/common/features.cc | 2 +-
.../platform/runtime_enabled_features.json5 | 13 +++++++++----
17 files changed, 32 insertions(+), 82 deletions(-)
17 files changed, 32 insertions(+), 81 deletions(-)
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1264,14 +1264,6 @@ by a child template that "extends" this file.
@@ -1276,14 +1276,6 @@ by a child template that "extends" this file.
android:readPermission="android.permission.GLOBAL_SEARCH" />
</provider>
@ -67,7 +67,7 @@ diff --git a/chrome/browser/attribution_reporting/android/internal/java/src/org/
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -428,7 +428,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption",
@@ -416,7 +416,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption",
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kAppToWebAttribution{"AppToWebAttribution",
@ -93,7 +93,7 @@ diff --git a/components/embedder_support/origin_trials/features.cc b/components/
diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
--- a/components/renderer_context_menu/render_view_context_menu_base.cc
+++ b/components/renderer_context_menu/render_view_context_menu_base.cc
@@ -485,9 +485,6 @@ void RenderViewContextMenuBase::OpenURLWithExtraHeaders(
@@ -484,9 +484,6 @@ void RenderViewContextMenuBase::OpenURLWithExtraHeaders(
open_url_params.source_site_instance = site_instance_;
@ -113,7 +113,7 @@ diff --git a/content/browser/android/navigation_handle_proxy.cc b/content/browse
- std::vector<uint8_t> byte_vector;
- if (cpp_navigation_handle_->GetImpression()) {
- blink::mojom::ImpressionPtr impression =
- AttributionHost::MojoImpressionFromImpression(
- ConversionHost::MojoImpressionFromImpression(
- *cpp_navigation_handle_->GetImpression());
- byte_vector = blink::mojom::Impression::Serialize(&impression);
- impression_byte_buffer = base::android::ScopedJavaLocalRef<jobject>(
@ -123,15 +123,15 @@ diff --git a/content/browser/android/navigation_handle_proxy.cc b/content/browse
java_navigation_handle_ = Java_NavigationHandle_Constructor(
env, reinterpret_cast<jlong>(this),
url::GURLAndroid::FromNativeGURL(env, cpp_navigation_handle_->GetURL()),
diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
--- a/content/browser/attribution_reporting/attribution_host.cc
+++ b/content/browser/attribution_reporting/attribution_host.cc
@@ -420,14 +420,6 @@ void AttributionHost::BindReceiver(
diff --git a/content/browser/conversions/conversion_host.cc b/content/browser/conversions/conversion_host.cc
--- a/content/browser/conversions/conversion_host.cc
+++ b/content/browser/conversions/conversion_host.cc
@@ -400,14 +400,6 @@ void ConversionHost::BindReceiver(
conversion_host->receivers_.Bind(rfh, std::move(receiver));
}
-// static
-blink::mojom::ImpressionPtr AttributionHost::MojoImpressionFromImpression(
-blink::mojom::ImpressionPtr ConversionHost::MojoImpressionFromImpression(
- const blink::Impression& impression) {
- return blink::mojom::Impression::New(
- impression.conversion_destination, impression.reporting_origin,
@ -139,12 +139,12 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
-}
-
// static
void AttributionHost::SetReceiverImplForTesting(AttributionHost* impl) {
void ConversionHost::SetReceiverImplForTesting(ConversionHost* impl) {
g_receiver_for_testing = impl;
diff --git a/content/browser/attribution_reporting/attribution_host.h b/content/browser/attribution_reporting/attribution_host.h
--- a/content/browser/attribution_reporting/attribution_host.h
+++ b/content/browser/attribution_reporting/attribution_host.h
@@ -58,9 +58,6 @@ class CONTENT_EXPORT AttributionHost
diff --git a/content/browser/conversions/conversion_host.h b/content/browser/conversions/conversion_host.h
--- a/content/browser/conversions/conversion_host.h
+++ b/content/browser/conversions/conversion_host.h
@@ -58,9 +58,6 @@ class CONTENT_EXPORT ConversionHost
const url::Origin& impression_origin,
const blink::Impression& impression);
@ -152,12 +152,12 @@ diff --git a/content/browser/attribution_reporting/attribution_host.h b/content/
- const blink::Impression& impression) WARN_UNUSED_RESULT;
-
// Overrides the target object to bind |receiver| to in BindReceiver().
static void SetReceiverImplForTesting(AttributionHost* impl);
static void SetReceiverImplForTesting(ConversionHost* impl);
diff --git a/content/browser/attribution_reporting/attribution_host_utils.cc b/content/browser/attribution_reporting/attribution_host_utils.cc
--- a/content/browser/attribution_reporting/attribution_host_utils.cc
+++ b/content/browser/attribution_reporting/attribution_host_utils.cc
@@ -19,6 +19,8 @@
diff --git a/content/browser/conversions/conversion_host_utils.cc b/content/browser/conversions/conversion_host_utils.cc
--- a/content/browser/conversions/conversion_host_utils.cc
+++ b/content/browser/conversions/conversion_host_utils.cc
@@ -18,6 +18,8 @@
#include "url/gurl.h"
#include "url/origin.h"
@ -165,8 +165,8 @@ diff --git a/content/browser/attribution_reporting/attribution_host_utils.cc b/c
+
namespace content {
namespace attribution_host_utils {
@@ -81,6 +83,10 @@ absl::optional<blink::Impression> ParseImpressionFromApp(
namespace conversion_host_utils {
@@ -77,6 +79,10 @@ absl::optional<blink::Impression> ParseImpressionFromApp(
// Java API should have rejected these already.
DCHECK(!source_event_id.empty() && !destination.empty());
@ -177,10 +177,10 @@ diff --git a/content/browser/attribution_reporting/attribution_host_utils.cc b/c
blink::Impression impression;
if (!base::StringToUint64(source_event_id, &impression.impression_data))
return absl::nullopt;
diff --git a/content/browser/attribution_reporting/attribution_network_sender_impl.cc b/content/browser/attribution_reporting/attribution_network_sender_impl.cc
--- a/content/browser/attribution_reporting/attribution_network_sender_impl.cc
+++ b/content/browser/attribution_reporting/attribution_network_sender_impl.cc
@@ -143,13 +143,9 @@ void AttributionNetworkSenderImpl::SendReport(
diff --git a/content/browser/conversions/conversion_network_sender_impl.cc b/content/browser/conversions/conversion_network_sender_impl.cc
--- a/content/browser/conversions/conversion_network_sender_impl.cc
+++ b/content/browser/conversions/conversion_network_sender_impl.cc
@@ -144,13 +144,9 @@ void ConversionNetworkSenderImpl::SendReport(ConversionReport report,
LogMetricsOnReportSend(report);
@ -188,7 +188,7 @@ diff --git a/content/browser/attribution_reporting/attribution_network_sender_im
- // deleted before |this|.
- simple_url_loader_ptr->DownloadHeadersOnly(
- url_loader_factory_.get(),
- base::BindOnce(&AttributionNetworkSenderImpl::OnReportSent,
- base::BindOnce(&ConversionNetworkSenderImpl::OnReportSent,
- base::Unretained(this), std::move(it), std::move(report),
- std::move(sent_callback)));
+ // this code is never called but if it were, nothing would be sent
@ -196,37 +196,37 @@ diff --git a/content/browser/attribution_reporting/attribution_network_sender_im
+ nullptr);
}
void AttributionNetworkSenderImpl::SetURLLoaderFactoryForTesting(
@@ -162,6 +158,13 @@ void AttributionNetworkSenderImpl::OnReportSent(
AttributionReport report,
void ConversionNetworkSenderImpl::SetURLLoaderFactoryForTesting(
@@ -163,6 +159,13 @@ void ConversionNetworkSenderImpl::OnReportSent(
ConversionReport report,
ReportSentCallback sent_callback,
scoped_refptr<net::HttpResponseHeaders> headers) {
+ if ((true)) {
+ std::move(sent_callback)
+ .Run(SentReport(std::move(report),
+ SentReport::Status::kSent,
+ .Run(SentReportInfo(std::move(report),
+ SentReportInfo::Status::kSent,
+ /*response_code*/200));
+ return;
+ }
network::SimpleURLLoader* loader = it->get();
// Consider a non-200 HTTP code as a non-internal error.
diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
--- a/content/browser/attribution_reporting/attribution_storage_sql.cc
+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
@@ -271,7 +271,7 @@ void AttributionStorageSql::RunInMemoryForTesting() {
diff --git a/content/browser/conversions/conversion_storage_sql.cc b/content/browser/conversions/conversion_storage_sql.cc
--- a/content/browser/conversions/conversion_storage_sql.cc
+++ b/content/browser/conversions/conversion_storage_sql.cc
@@ -227,7 +227,7 @@ void ConversionStorageSql::RunInMemoryForTesting() {
}
// static
-bool AttributionStorageSql::g_run_in_memory_ = false;
+bool AttributionStorageSql::g_run_in_memory_ = true;
-bool ConversionStorageSql::g_run_in_memory_ = false;
+bool ConversionStorageSql::g_run_in_memory_ = true; // use in-memory db
AttributionStorageSql::AttributionStorageSql(
ConversionStorageSql::ConversionStorageSql(
const base::FilePath& path_to_database,
diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc
--- a/content/browser/renderer_host/navigation_controller_android.cc
+++ b/content/browser/renderer_host/navigation_controller_android.cc
@@ -319,22 +319,6 @@ void NavigationControllerAndroid::LoadUrl(
@@ -316,21 +316,6 @@ void NavigationControllerAndroid::LoadUrl(
if (input_start != 0)
params.input_start = base::TimeTicks::FromUptimeMillis(input_start);
@ -237,7 +237,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/co
- params.initiator_origin = OriginFromAndroidPackageName(
- ConvertJavaStringToUTF8(env, source_package_name));
-
- params.impression = attribution_host_utils::ParseImpressionFromApp(
- params.impression = conversion_host_utils::ParseImpressionFromApp(
- ConvertJavaStringToUTF8(env, attribution_source_event_id),
- ConvertJavaStringToUTF8(env, attribution_destination),
- attribution_report_to
@ -245,26 +245,25 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/co
- : "",
- attribution_expiry);
- }
-
params.override_user_agent = static_cast<NavigationController::UserAgentOverrideOption>(
user_agent_override_option);
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1305,12 +1305,7 @@ void StoragePartitionImpl::Initialize(
@@ -1338,12 +1338,7 @@ void StoragePartitionImpl::Initialize(
bucket_context_ = base::MakeRefCounted<BucketContext>();
bucket_context_->Initialize(quota_manager_proxy);
bucket_context_->Initialize();
- // The Conversion Measurement API is not available in Incognito mode.
- if (!is_in_memory() &&
- base::FeatureList::IsEnabled(blink::features::kConversionMeasurement)) {
- attribution_manager_ = std::make_unique<AttributionManagerImpl>(
- conversion_manager_ = std::make_unique<ConversionManagerImpl>(
- this, path, special_storage_policy_);
- }
+ // The Conversion Measurement API is not available in Bromite.
if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
if (base::FeatureList::IsEnabled(blink::features::kFledgeInterestGroups)) {
interest_group_manager_ = std::make_unique<InterestGroupManager>(
diff --git a/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java b/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/AttributionReporterImpl.java
@ -278,12 +277,12 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
}
/**
@@ -33,8 +31,6 @@ public class AttributionReporterImpl extends AttributionReporter {
@@ -32,8 +30,6 @@ public class AttributionReporterImpl extends AttributionReporter {
@Override
public void reportAppImpression(BrowserContextHandle browserContext, String sourcePackageName,
String sourceEventId, String destination, String reportTo, long expiry,
long eventTime) {
- AttributionReporterImplJni.get().reportAppImpression(browserContext, sourcePackageName,
- sourceEventId, destination, reportTo, expiry, eventTime);
String sourceEventId, String destination, String reportTo, long expiry) {
- AttributionReporterImplJni.get().reportAppImpression(
- browserContext, sourcePackageName, sourceEventId, destination, reportTo, expiry);
}
@NativeMethods
@ -301,7 +300,7 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -42,7 +42,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries",
@@ -32,7 +32,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries",
// Controls whether the Conversion Measurement API infrastructure is enabled.
const base::Feature kConversionMeasurement{"ConversionMeasurement",
@ -309,7 +308,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
+ base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kGMSCoreEmoji{"GMSCoreEmoji",
base::FEATURE_ENABLED_BY_DEFAULT};
base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@ -327,7 +326,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
{
name: "Accelerated2dCanvas",
settable_from_internals: true,
@@ -482,13 +489,11 @@
@@ -463,13 +470,11 @@
},
{
name: "ConversionMeasurement",
@ -343,5 +342,6 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
},
{
name: "CooperativeScheduling"
--
2.25.1
--
2.20.1