PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

v116 to be checked

Browse Source
This commit is contained in:
Carmelo Messina
2023-08-05 13:40:25 +02:00
parent 22eed850f1
commit 364170fea6
8 changed files with 278 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Disable-StartSurface-feature.patch
+16 -3
View File
@@ -6,13 +6,14 @@ This feature would normally show a search box but leads to crashes.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/browser/flags/android/chrome_feature_list.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
chrome/browser/flags/android/chrome_feature_list.cc | 4 ++--
.../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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
@@ -1095,8 +1095,8 @@ BASE_FEATURE(kResizeOnlyActiveTab,
@@ -1109,8 +1109,8 @@ BASE_FEATURE(kResizeOnlyActiveTab,
BASE_FEATURE(kSpareTab, "SpareTab", base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kStartSurfaceAndroid,
@@ -23,5 +24,17 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kFeedPositionAndroid,
"FeedPositionAndroid",
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -584,7 +584,7 @@ public abstract class ChromeFeatureList {
new CachedFlag(SHOULD_IGNORE_INTENT_SKIP_INTERNAL_CHECK, true);
public static final CachedFlag sSpareTab = new CachedFlag(SPARE_TAB, false);
public static final CachedFlag sStartSurfaceAndroid = new CachedFlag(
- START_SURFACE_ANDROID, ChromePreferenceKeys.FLAGS_CACHED_START_SURFACE_ENABLED, true);
+ START_SURFACE_ANDROID, ChromePreferenceKeys.FLAGS_CACHED_START_SURFACE_ENABLED, false);
public static final CachedFlag sStartSurfaceDisabledFeedImprovement =
new CachedFlag(START_SURFACE_DISABLED_FEED_IMPROVEMENT, false);
public static final CachedFlag sStartSurfaceOnTablet =
--
2.25.1
build/patches/Disable-feeds-support-by-default.patch
+1 -1
View File
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
@@ -50,13 +50,7 @@ public final class FeedFeatures {
@@ -48,13 +48,7 @@ public final class FeedFeatures {
* the user is signed in and confirms it's not a child profile.
*/
public static boolean isWebFeedUIEnabled() {
build/patches/Disable-smart-selection-by-default.patch
+13 -13
View File
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
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
@@ -183,6 +183,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -185,6 +185,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kCCTClientDataHeader,
&kCCTFeatureUsage,
&kCCTIncognito,
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kCCTIncognitoAvailableToThirdParty,
&kCCTIntentFeatureOverrides,
&kCCTNewDownloadTab,
@@ -1015,6 +1016,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
@@ -1025,6 +1026,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
"DiscoverFeedMultiColumn",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -64,7 +64,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -66,6 +66,7 @@ BASE_DECLARE_FEATURE(kCCTToolbarCustomizations);
@@ -65,6 +65,7 @@ BASE_DECLARE_FEATURE(kCCTToolbarCustomizations);
BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls);
BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
BASE_DECLARE_FEATURE(kChromeNewDownloadTab);
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -172,6 +172,7 @@ public abstract class ChromeFeatureList {
@@ -180,6 +180,7 @@ public abstract class ChromeFeatureList {
public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS_ALTERNATIVE_IMPL =
"CCTRealTimeEngagementSignalsAlternativeImpl";
public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect";
@@ -86,19 +86,19 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -851,7 +851,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
menu.removeItem(R.id.select_action_menu_share);
}
@@ -904,7 +904,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
*/
@Override
public boolean canWebSearch() {
- return hasSelection() && !isFocusedNodeEditable() && !isIncognito()
+ return hasSelection() && !isFocusedNodeEditable()
&& isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH);
}
- if (isFocusedNodeEditable() || isIncognito()
+ if (isFocusedNodeEditable()
|| !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) {
menu.removeItem(R.id.select_action_menu_web_search);
}
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -3398,6 +3398,21 @@
@@ -3416,6 +3416,21 @@
]
}
],
build/patches/Guard-for-user-agent-reduction.patch
+37 -15
View File
@@ -4,16 +4,16 @@ Subject: Guard for user-agent reduction
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/browser/chrome_content_browser_client.cc | 2 +-
content/common/user_agent.cc | 13 +++++--------
third_party/blink/common/features.cc | 4 ++--
.../platform/runtime_enabled_features.json5 | 3 ++-
4 files changed, 10 insertions(+), 12 deletions(-)
chrome/browser/chrome_content_browser_client.cc | 2 +-
content/common/user_agent.cc | 13 +++++--------
third_party/blink/common/features.cc | 4 ++--
.../platform/runtime_enabled_features.json5 | 16 ++++++++--------
4 files changed, 16 insertions(+), 19 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
@@ -1633,7 +1633,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
@@ -1630,7 +1630,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
registry->RegisterIntegerPref(
prefs::kUserAgentReduction,
static_cast<int>(
@@ -55,7 +55,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
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
@@ -1324,8 +1324,8 @@ BASE_FEATURE(kDurableClientHintsCache,
@@ -1345,8 +1345,8 @@ BASE_FEATURE(kReducedReferrerGranularity,
const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
&kReduceUserAgentMinorVersion, "build_version", "0"};
@@ -69,15 +69,37 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
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
@@ -3648,7 +3648,8 @@
status: "stable",
@@ -2909,23 +2909,23 @@
// If enabled, the deviceModel will be reduced to "K" and the
// androidVersion will be reduced to a static "10" string in android
// User-Agent string.
- name: "ReduceUserAgentAndroidVersionDeviceModel",
- depends_on: ["ReduceUserAgentMinorVersion"],
- status: {"Android": "stable"},
+ name: "ReduceUserAgentAndroidVersionDeviceModel", // keep
+ depends_on: ["ReduceUserAgentMinorVersion"], // enabled
+ status: {"Android": "stable"}, // in bromite
},
// If enabled, the minor version of the User-Agent string will be reduced.
// This User-Agent Reduction feature has been enabled starting from M101,
// but we still keep this flag for future phase tests.
{
- name: "ReduceUserAgentMinorVersion",
- status: "stable",
+ name: "ReduceUserAgentMinorVersion", // keep enabled
+ status: "stable", // in bromite
},
{
- name: "UserAgentReduction",
+ name: "UserAgentReduction", // always enabled
+ status: "stable", // in bromite
origin_trial_feature_name: "UserAgentReduction",
origin_trial_allows_third_party: true,
// iOS not included as it should not send a reduced User-Agent string.
// If enabled, the platform and oscpu of the User-Agent string will be
// reduced.
- name: "ReduceUserAgentPlatformOsCpu",
- depends_on: ["ReduceUserAgentMinorVersion"],
- status: {"Android": "", "default": "stable"},
+ name: "ReduceUserAgentPlatformOsCpu", // keep
+ depends_on: ["ReduceUserAgentMinorVersion"], // enabled
+ status: {"Android": "", "default": "stable"}, // in bromite
},
{
name: "RegionCapture",
--
2.25.1
build/patches/Remove-binary-blob-integrations.patch
+65 -88
View File
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../features/cablev2_authenticator/BUILD.gn | 2 -
chrome/android/java/AndroidManifest.xml | 51 --
.../org/chromium/chrome/browser/AppHooks.java | 9 +-
.../browser/ChromeBackgroundService.java | 12 +-
.../browser/ChromeBackgroundService.java | 11 +-
.../browser/PlayServicesVersionInfo.java | 11 +-
.../ChromeBackgroundTaskFactory.java | 3 -
.../gcore/ChromeGoogleApiClientImpl.java | 25 +-
@@ -92,7 +92,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
content/public/android/BUILD.gn | 4 -
content/test/BUILD.gn | 4 -
device/BUILD.gn | 3 -
device/fido/features.cc | 10 +-
remoting/android/client_java_tmpl.gni | 3 -
services/BUILD.gn | 9 -
services/device/geolocation/BUILD.gn | 4 -
@@ -102,7 +101,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
weblayer/browser/java/BUILD.gn | 1 -
weblayer/public/java/BUILD.gn | 1 -
78 files changed, 97 insertions(+), 1925 deletions(-)
77 files changed, 92 insertions(+), 1919 deletions(-)
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -129,7 +128,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -270,14 +270,6 @@ if (current_toolchain == default_toolchain) {
@@ -272,14 +272,6 @@ if (current_toolchain == default_toolchain) {
":chrome_public_apk_template_resources",
":update_proto_java",
":usage_stats_proto_java",
@@ -144,7 +143,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:jni_java",
"//cc:cc_java",
"//cc/mojom:mojom_java",
@@ -575,14 +567,23 @@ if (current_toolchain == default_toolchain) {
@@ -582,14 +574,23 @@ if (current_toolchain == default_toolchain) {
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
@@ -171,7 +170,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_media:android_media_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
@@ -855,11 +856,6 @@ if (current_toolchain == default_toolchain) {
@@ -867,11 +868,6 @@ if (current_toolchain == default_toolchain) {
":chrome_java",
":chrome_jni_headers",
":delegate_public_impl_java",
@@ -180,10 +179,10 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
- "$google_play_services_package:google_play_services_cast_framework_java",
- "$google_play_services_package:google_play_services_cast_java",
- "$google_play_services_package:google_play_services_gcm_java",
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java_test_support",
"//base:base_java_test_support_uncommon",
"//base:base_junit_test_support",
@@ -1436,13 +1432,6 @@ if (current_toolchain == default_toolchain) {
@@ -1455,13 +1451,6 @@ if (current_toolchain == default_toolchain) {
":chrome_test_util_java",
":critical_persisted_tab_data_flatbuffer_test_v1_java",
":delegate_public_impl_java",
@@ -197,7 +196,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_java_test_support_uncommon",
@@ -2327,7 +2316,6 @@ if (current_toolchain == default_toolchain) {
@@ -2352,7 +2341,6 @@ if (current_toolchain == default_toolchain) {
]
deps = [
":chrome_java",
@@ -205,7 +204,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2424,7 +2412,6 @@ if (current_toolchain == default_toolchain) {
@@ -2449,7 +2437,6 @@ if (current_toolchain == default_toolchain) {
# is in a DFM.
android_library("base_module_java") {
sources = [
@@ -213,7 +212,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/app/TrichromeZygotePreload.java",
"java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
@@ -2440,8 +2427,6 @@ if (current_toolchain == default_toolchain) {
@@ -2465,8 +2452,6 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
@@ -222,7 +221,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
@@ -2466,17 +2451,11 @@ if (current_toolchain == default_toolchain) {
@@ -2491,17 +2476,11 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
"java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
@@ -240,7 +239,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:jni_java",
"//chrome/browser/download/android:file_provider_java",
@@ -2490,7 +2469,6 @@ if (current_toolchain == default_toolchain) {
@@ -2515,7 +2494,6 @@ if (current_toolchain == default_toolchain) {
"//components/media_router/browser/android:cast_options_provider_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/module_installer/android:module_installer_java",
@@ -248,7 +247,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_collection_collection_java",
"//ui/android:ui_no_recycler_view_java",
@@ -2509,7 +2487,6 @@ if (current_toolchain == default_toolchain) {
@@ -2534,7 +2512,6 @@ if (current_toolchain == default_toolchain) {
# Deps to pull services into base module.
# TODO(crbug.com/1126301): Consider moving these to the chrome module to
# reduce base dex size.
@@ -267,7 +266,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
@@ -988,10 +987,6 @@ chrome_java_sources = [
@@ -979,10 +978,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/segmentation_platform/PriceTrackingActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java",
@@ -281,7 +280,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/android/features/cablev2_authenticator/BUILD.gn
--- a/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -15,8 +15,6 @@ android_library("java") {
@@ -16,8 +16,6 @@ android_library("java") {
deps = [
":java_resources",
@@ -406,7 +405,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
import org.chromium.base.ContextUtils;
import org.chromium.base.PackageUtils;
import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
@@ -235,11 +232,7 @@ public abstract class AppHooks {
@@ -234,11 +231,7 @@ public abstract class AppHooks {
* same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
*/
public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
@@ -422,7 +421,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
@@ -4,16 +4,6 @@
@@ -4,15 +4,6 @@
package org.chromium.chrome.browser;
@@ -431,8 +430,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroun
-
/** See {@link ChromeBackgroundServiceImpl}. */
-public class ChromeBackgroundService extends SplitCompatGcmTaskService {
- @IdentifierNameString
- private static String sImplClassName =
- private static @IdentifierNameString String sImplClassName =
- "org.chromium.chrome.browser.ChromeBackgroundServiceImpl";
-
- public ChromeBackgroundService() {
@@ -705,7 +703,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
@@ -34,8 +34,8 @@ public class InstantAppsHandler {
@@ -32,8 +32,8 @@ public class InstantAppsHandler {
* @return Whether or not the instant app specified by the entry in the page's manifest is
* either available, or would be available if the user wasn't in the holdback group.
*/
@@ -728,19 +726,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta
-
import org.chromium.base.BuildInfo;
import org.chromium.base.Callback;
import org.chromium.base.ContextUtils;
import org.chromium.base.ObserverList;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -124,7 +124,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -129,7 +129,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
private Preference mLinkPref;
private Menu mMenu;
- private @Nullable PasswordCheck mPasswordCheck;
private @ManagePasswordsReferrer int mManagePasswordsReferrer;
private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
@@ -191,7 +190,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
private Profile mProfile;
@@ -203,7 +202,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -748,7 +746,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
computeTrustedVaultBannerState();
}
@@ -295,9 +293,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -307,9 +305,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
createSavePasswordsSwitch();
createAutoSignInCheckbox();
@@ -758,7 +756,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
createTrustedVaultBanner(R.string.android_trusted_vault_banner_sub_label_opted_in,
@@ -475,10 +470,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -503,10 +498,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
// by the system.
if (getActivity().isFinishing()) {
PasswordManagerHandlerProvider.getInstance().removeObserver(this);
@@ -874,7 +872,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn
--- a/chrome/browser/password_manager/android/BUILD.gn
+++ b/chrome/browser/password_manager/android/BUILD.gn
@@ -98,8 +98,6 @@ android_library("java") {
@@ -97,8 +97,6 @@ android_library("java") {
":android_backend_java_enums",
":java_resources",
":settings_interface_java",
@@ -883,7 +881,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p
"//base:base_java",
"//base:jni_java",
"//build/android:build_java",
@@ -216,8 +214,6 @@ robolectric_binary("password_manager_junit_tests") {
@@ -218,8 +216,6 @@ robolectric_binary("password_manager_junit_tests") {
":public_impl_java",
":settings_interface_java",
":test_support_java",
@@ -916,7 +914,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
return AndroidBackendErrorType.UNCATEGORIZED;
}
@@ -40,44 +33,15 @@ class PasswordManagerAndroidBackendUtil {
@@ -40,43 +33,14 @@ class PasswordManagerAndroidBackendUtil {
return ((PasswordCheckupClientHelper.PasswordCheckBackendException) exception)
.errorCode;
}
@@ -934,8 +932,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
+ return 13; // '13' means ERROR
}
@Nullable
static Integer getConnectionResultCode(Exception exception) {
static @Nullable Integer getConnectionResultCode(Exception exception) {
- if (!(exception instanceof ApiException)) return null;
-
- ConnectionResult connectionResult =
@@ -976,7 +973,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
import org.chromium.base.Callback;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.supplier.Supplier;
@@ -415,21 +412,6 @@ public class PasswordManagerHelper {
@@ -417,21 +414,6 @@ public class PasswordManagerHelper {
}
public static void launchGmsUpdate(Context context) {
@@ -998,7 +995,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
}
@VisibleForTesting
@@ -516,7 +498,7 @@ public class PasswordManagerHelper {
@@ -518,7 +500,7 @@ public class PasswordManagerHelper {
RecordHistogram.recordEnumeratedHistogram(kGetIntentErrorHistogram,
CredentialManagerError.API_ERROR, CredentialManagerError.COUNT);
@@ -1052,7 +1049,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -50,8 +50,6 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
@@ -54,8 +54,6 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
if (loadTimeData.getBoolean('enableSecurityKeysSubpage')) {
r.SECURITY_KEYS = r.SECURITY.createChild('/securityKeys');
@@ -1064,7 +1061,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -357,8 +357,6 @@ static_library("ui") {
@@ -367,8 +367,6 @@ static_library("ui") {
"webui/flags/flags_ui.h",
"webui/flags/flags_ui_handler.cc",
"webui/flags/flags_ui_handler.h",
@@ -1073,7 +1070,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"webui/internals/internals_ui.cc",
"webui/internals/internals_ui.h",
"webui/interstitials/interstitial_ui.cc",
@@ -594,7 +592,6 @@ static_library("ui") {
@@ -600,7 +598,6 @@ static_library("ui") {
"//components/feedback/redaction_tool",
"//components/find_in_page",
"//components/flags_ui",
@@ -1127,7 +1124,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
#include "chrome/browser/ui/webui/internals/internals_ui.h"
#include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
#include "chrome/browser/ui/webui/intro/intro_ui.h"
@@ -462,8 +461,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
@@ -469,8 +468,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<FlagsDeprecatedUI>;
if (url.host_piece() == chrome::kChromeUIFlagsHost)
return &NewWebUI<FlagsUI>;
@@ -1139,7 +1136,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -1150,10 +1150,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms() {
@@ -1169,10 +1169,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms() {
if (cable_ui_type_) {
switch (*cable_ui_type_) {
case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_2ND_FACTOR:
@@ -1166,7 +1163,7 @@ diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauth
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -284,8 +284,6 @@ android_library("chrome_java_integration_test_support") {
@@ -240,8 +240,6 @@ android_library("chrome_java_integration_test_support") {
deps = [
":chrome_java_test_support_common",
@@ -1355,7 +1352,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
// Make sure no checkin is in progress.
if (checkin_request_)
@@ -736,6 +739,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
@@ -732,6 +735,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
@@ -1374,7 +1371,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm
"//base:base_java",
"//base:jni_java",
"//build/android:build_java",
@@ -29,14 +28,12 @@ android_library("instance_id_driver_java") {
@@ -30,14 +29,12 @@ android_library("instance_id_driver_java") {
sources = [
"java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java",
@@ -2904,7 +2901,7 @@ diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/compo
diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
--- a/components/module_installer/android/BUILD.gn
+++ b/components/module_installer/android/BUILD.gn
@@ -32,11 +32,9 @@ android_library("module_installer_java") {
@@ -33,11 +33,9 @@ android_library("module_installer_java") {
]
deps = [
@@ -2916,7 +2913,7 @@ diff --git a/components/module_installer/android/BUILD.gn b/components/module_in
"//third_party/androidx:androidx_annotation_annotation_java",
]
@@ -58,11 +56,9 @@ robolectric_binary("module_installer_junit_tests") {
@@ -57,11 +55,9 @@ robolectric_binary("module_installer_junit_tests") {
]
deps = [
":module_installer_java",
@@ -2940,7 +2937,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi
"//base:base_java",
"//base:jni_java",
"//build/android:build_java",
@@ -177,7 +175,6 @@ robolectric_library("junit") {
@@ -176,7 +174,6 @@ robolectric_library("junit") {
deps = [
":java",
":signin_java_test_support",
@@ -2993,7 +2990,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/
"java/src/org/chromium/components/webauthn/InternalAuthenticator.java",
"java/src/org/chromium/components/webauthn/WebAuthnBrowserBridge.java",
]
@@ -17,11 +15,7 @@ android_library("java") {
@@ -18,11 +16,7 @@ android_library("java") {
sources = [
"java/src/org/chromium/components/webauthn/AuthenticatorFactory.java",
"java/src/org/chromium/components/webauthn/AuthenticatorImpl.java",
@@ -3005,9 +3002,9 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/
"java/src/org/chromium/components/webauthn/GetAssertionResponseCallback.java",
"java/src/org/chromium/components/webauthn/GetMatchingCredentialIdsResponseCallback.java",
"java/src/org/chromium/components/webauthn/InternalAuthenticator.java",
@@ -32,9 +26,6 @@ android_library("java") {
@@ -33,9 +27,6 @@ android_library("java") {
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
deps = [
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_basement_java",
@@ -3015,7 +3012,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/
"//base:base_java",
"//base:jni_java",
"//build/android:build_java",
@@ -84,8 +75,6 @@ android_library("test_support_java") {
@@ -87,8 +78,6 @@ android_library("test_support_java") {
source_set("android") {
sources = [
@@ -3196,7 +3193,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java
--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java
@@ -8,10 +8,6 @@ import android.os.Parcel;
@@ -10,10 +10,6 @@ import android.os.Parcel;
import androidx.annotation.VisibleForTesting;
@@ -3205,13 +3202,12 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
-import com.google.android.gms.tasks.Task;
-
import org.chromium.base.ContextUtils;
import java.util.List;
@@ -37,21 +33,4 @@ public class Fido2ApiCallHelper {
}
return sInstance;
import org.chromium.blink.mojom.PublicKeyCredentialCreationOptions;
import org.chromium.blink.mojom.PublicKeyCredentialRequestOptions;
@@ -50,23 +46,6 @@ public class Fido2ApiCallHelper {
new UserRecoverableErrorHandler.Silent());
}
-
- public void invokeFido2GetCredentials(String relyingPartyId,
- OnSuccessListener<List<WebAuthnCredentialDetails>> successCallback,
- OnFailureListener failureCallback) {
@@ -3228,11 +3224,14 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
- task.addOnSuccessListener(successCallback);
- task.addOnFailureListener(failureCallback);
- }
}
-
public void invokeFido2MakeCredential(PublicKeyCredentialCreationOptions options, Uri uri,
byte[] clientDataHash, OnSuccessListener<PendingIntent> successCallback,
OnFailureListener failureCallback) throws NoSuchAlgorithmException {
diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc
--- a/content/browser/push_messaging/push_messaging_manager.cc
+++ b/content/browser/push_messaging/push_messaging_manager.cc
@@ -799,7 +799,7 @@ void PushMessagingManager::GetSubscriptionInfo(
@@ -800,7 +800,7 @@ void PushMessagingManager::GetSubscriptionInfo(
}
PushMessagingService* PushMessagingManager::GetService() {
@@ -3244,7 +3243,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -130,10 +130,6 @@ android_library("content_full_java") {
@@ -141,10 +141,6 @@ android_library("content_full_java") {
deps = [
":content_java_resources",
":content_main_dex_java",
@@ -3258,7 +3257,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -3312,10 +3312,6 @@ if (is_android) {
@@ -3359,10 +3359,6 @@ if (is_android) {
testonly = true
sources = content_java_sources_needing_jni
deps = [
@@ -3272,7 +3271,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
diff --git a/device/BUILD.gn b/device/BUILD.gn
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -519,9 +519,6 @@ if (is_android) {
@@ -496,9 +496,6 @@ if (is_android) {
"gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
]
deps = [
@@ -3282,28 +3281,6 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//device/gamepad:java",
diff --git a/device/fido/features.cc b/device/fido/features.cc
--- a/device/fido/features.cc
+++ b/device/fido/features.cc
@@ -33,13 +33,13 @@ BASE_FEATURE(kWebAuthnGoogleCorpRemoteDesktopClientPrivilege,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kWebAuthPasskeysUI,
- "WebAuthenticationPasskeysUI",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "WebAuthenticationPasskeysUI", // disabled by default
+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite
// Added in M112. Remove in or after M115.
-BASE_FEATURE(kWebAuthnCredProtectThree,
- "WebAuthenticationCredProtectThree",
- base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kWebAuthnCredProtectThree, // disabled by default
+ "WebAuthenticationCredProtectThree", // in Bromite
+ base::FEATURE_DISABLED_BY_DEFAULT);
// Added in M112. Enabled in M113. Remove in or after M116.
BASE_FEATURE(kWebAuthnPRFAsAuthenticator,
diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
--- a/remoting/android/client_java_tmpl.gni
+++ b/remoting/android/client_java_tmpl.gni
@@ -3320,7 +3297,7 @@ diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_jav
diff --git a/services/BUILD.gn b/services/BUILD.gn
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -124,11 +124,6 @@ if (is_android) {
@@ -120,11 +120,6 @@ if (is_android) {
"shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
]
deps = [
@@ -3332,7 +3309,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -157,10 +152,6 @@ if (is_android) {
@@ -153,10 +148,6 @@ if (is_android) {
"shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
]
deps = [
@@ -3346,7 +3323,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
@@ -165,10 +165,6 @@ if (is_android) {
@@ -166,10 +166,6 @@ if (is_android) {
deps = [
":geolocation_jni_headers",
@@ -4030,8 +4007,8 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices
diff --git a/weblayer/browser/java/BUILD.gn b/weblayer/browser/java/BUILD.gn
--- a/weblayer/browser/java/BUILD.gn
+++ b/weblayer/browser/java/BUILD.gn
@@ -86,7 +86,6 @@ android_library("base_module_java") {
]
@@ -91,7 +91,6 @@ android_library("base_module_java") {
srcjar_deps = [ ":base_module_jni" ]
deps = [
":base_module_interfaces_java",
- "$google_play_services_package:google_play_services_basement_java",
build/patches/eyeo-beta-114.0.5735.53-v1-base.patch
+66 -64
View File
@@ -60,7 +60,7 @@ Based on Chromium 114.0.5735.53
..._page_load_metrics_observer_browsertest.cc | 7 +-
chrome/browser/preferences/BUILD.gn | 5 +
.../prefs/chrome_pref_service_factory.cc | 11 +
...hrome_browser_main_extra_parts_profiles.cc | 28 +
...hrome_browser_main_extra_parts_profiles.cc | 33 +
.../profile_keyed_service_browsertest.cc | 17 +-
.../safe_browsing_blocking_page_test.cc | 8 +-
...subresource_filter_browser_test_harness.cc | 8 +-
@@ -440,7 +440,7 @@ Based on Chromium 114.0.5735.53
.../url_loader/mojo_url_loader_client.cc | 6 +-
.../definitions/adblock_private.d.ts | 191 ++
.../definitions/eyeo_filtering_private.d.ts | 228 ++
436 files changed, 46711 insertions(+), 11 deletions(-)
436 files changed, 46716 insertions(+), 11 deletions(-)
create mode 100644 chrome/browser/adblock/README.md
create mode 100644 chrome/browser/adblock/adblock_content_browser_client.cc
create mode 100644 chrome/browser/adblock/adblock_content_browser_client.h
@@ -850,8 +850,8 @@ diff --git a/DEPS b/DEPS
# By default, do not check out WebKit for iOS, as it is not needed unless
# running against ToT WebKit rather than system WebKit. This can be overridden
# e.g. with custom_vars.
@@ -290,6 +294,8 @@ vars = {
'siso_version': 'latest',
@@ -293,6 +297,8 @@ vars = {
'download_libaom_testdata': False,
'android_git': 'https://android.googlesource.com',
+ 'eyeo_distpartners_gitlab': 'https://gitlab.com/eyeo/distpartners',
@@ -859,9 +859,9 @@ diff --git a/DEPS b/DEPS
'aomedia_git': 'https://aomedia.googlesource.com',
'boringssl_git': 'https://boringssl.googlesource.com',
'chrome_git': 'https://chrome-internal.googlesource.com',
@@ -501,6 +507,11 @@ vars = {
@@ -508,6 +514,11 @@ vars = {
# and whatever else without interference from each other.
'betocore_revision': 'd905e113aa8df4f46e3f193a2433e59994510039',
'betocore_revision': '45756ea770c41085d5c71156b2c46da0b10117d6',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling feed
@@ -870,8 +870,8 @@ diff --git a/DEPS b/DEPS
+
# If you change this, also update the libc++ revision in
# //buildtools/deps_revisions.gni.
'libcxx_revision': 'f8279b01085b800724f5c5629dc365b9f040dc53',
@@ -820,6 +831,10 @@ deps = {
'libcxx_revision': '055b2e17ae4f0e2c025ad0c7508b01787df17758',
@@ -822,6 +833,10 @@ deps = {
'condition': 'checkout_android and checkout_src_internal',
},
@@ -880,9 +880,9 @@ diff --git a/DEPS b/DEPS
+ },
+
'src/docs/website': {
'url': Var('chromium_git') + '/website.git' + '@' + '1128ca7a99b4e1520df8b82c9cabdd512cfdc6fd',
'url': Var('chromium_git') + '/website.git' + '@' + '715769197cbe967605f24842ffcfb733d31b40fd',
},
@@ -969,6 +984,13 @@ deps = {
@@ -971,6 +986,13 @@ deps = {
'dep_type': 'cipd',
},
@@ -951,7 +951,7 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_ca
#ifndef BASE_TRACE_EVENT_BUILTIN_CATEGORIES_H_
#define BASE_TRACE_EVENT_BUILTIN_CATEGORIES_H_
@@ -86,6 +90,7 @@
@@ -85,6 +89,7 @@
X("exo") \
X("extensions") \
X("explore_sites") \
@@ -973,7 +973,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
import("//build/android/resource_sizes.gni")
import("//build/config/android/config.gni")
@@ -204,6 +208,7 @@ if (current_toolchain == default_toolchain) {
@@ -205,6 +209,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui/android/toolbar:java_resources",
"//chrome/browser/ui/android/webid/internal:java_resources",
"//chrome/browser/ui/messages/android:java_resources",
@@ -981,23 +981,23 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/autofill/android:autofill_java_resources",
"//components/autofill/android:autofill_payments_java_resources",
"//components/blocked_content/android:java_resources",
@@ -409,6 +414,7 @@ if (current_toolchain == default_toolchain) {
@@ -418,6 +423,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/webapps/android:java",
"//chrome/browser/webauthn/android:java",
"//chrome/browser/xsurface:java",
+ "//components/adblock/android:adblock_java",
"//components/autofill/android:autofill_java",
"//components/autofill/android:prefeditor_autofill_java",
"//components/background_task_scheduler:background_task_scheduler_java",
@@ -1579,6 +1585,7 @@ if (current_toolchain == default_toolchain) {
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
@@ -1602,6 +1608,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/test/android:chrome_java_integration_test_support",
"//chrome/test/android:chrome_java_test_pagecontroller",
"//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
+ "//components/adblock/android:adblock_java_tests",
"//components/autofill/android:autofill_features_java",
"//components/autofill/android:autofill_java",
"//components/autofill/android:prefeditor_autofill_java",
"//components/background_task_scheduler:background_task_scheduler_java",
@@ -1769,6 +1776,7 @@ if (current_toolchain == default_toolchain) {
@@ -1793,6 +1800,7 @@ if (current_toolchain == default_toolchain) {
srcjar_deps = [ "//chrome/browser:tos_dialog_behavior_generated_enum" ]
data = [
@@ -1005,7 +1005,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/test/data/android/",
"//chrome/test/data/autofill/",
"//chrome/test/data/background_sync/",
@@ -3472,6 +3480,7 @@ group("jni_headers") {
@@ -3503,6 +3511,7 @@ group("jni_headers") {
"//chrome/browser/ui/messages/android:jni_headers",
"//chrome/browser/util:jni_headers",
"//chrome/browser/webauthn/android:jni_headers",
@@ -1035,7 +1035,7 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat
#include "chrome/browser/buildflags.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h"
@@ -1699,7 +1704,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() {
@@ -1705,7 +1710,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() {
content::ContentBrowserClient*
ChromeMainDelegate::CreateContentBrowserClient() {
chrome_content_browser_client_ =
@@ -1057,7 +1057,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
import("//base/allocator/allocator.gni")
import("//build/buildflag_header.gni")
@@ -156,6 +159,26 @@ static_library("browser") {
@@ -158,6 +161,26 @@ static_library("browser") {
"accessibility/page_colors.h",
"accessibility/page_colors_factory.cc",
"accessibility/page_colors_factory.h",
@@ -1084,7 +1084,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"after_startup_task_utils.cc",
"after_startup_task_utils.h",
"app_mode/app_mode_utils.cc",
@@ -2048,6 +2071,8 @@ static_library("browser") {
@@ -2063,6 +2086,8 @@ static_library("browser") {
"//chrome/installer/util:with_no_strings",
"//chrome/services/speech/buildflags",
"//chromeos/components/kiosk",
@@ -1093,7 +1093,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/assist_ranker",
"//components/autofill/content/browser",
"//components/autofill/core/browser",
@@ -2569,6 +2594,18 @@ static_library("browser") {
@@ -2582,6 +2607,18 @@ static_library("browser") {
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/android_theme_resources.h",
"android/autocomplete/tab_matcher_android.cc",
"android/autocomplete/tab_matcher_android.h",
@@ -3276,6 +3313,7 @@ static_library("browser") {
@@ -3262,6 +3299,7 @@ static_library("browser") {
"webauthn/android/webauthn_request_delegate_android.cc",
"webauthn/android/webauthn_request_delegate_android.h",
]
@@ -7107,7 +7107,7 @@ diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/br
#include <cctype>
#include <cstddef>
@@ -663,7 +667,11 @@ class ClientHintsBrowserTest : public policy::PolicyTest {
@@ -639,7 +643,11 @@ class ClientHintsBrowserTest : public policy::PolicyTest {
virtual std::unique_ptr<base::FeatureList> EnabledFeatures() {
std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
feature_list->InitializeFromCommandLine(
@@ -7197,7 +7197,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
import("//build/config/android/rules.gni")
@@ -32,6 +36,7 @@ android_library("java") {
@@ -35,6 +39,7 @@ android_library("java") {
java_cpp_strings("java_pref_names_srcjar") {
sources = [
"//chrome/common/pref_names.cc",
@@ -7270,17 +7270,20 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
#include "chrome/browser/autocomplete/document_suggestions_service_factory.h"
#include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
@@ -213,6 +226,9 @@
@@ -219,6 +232,12 @@
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
#if BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_ANDROID)
+#include "chrome/browser/android/adblock/adblock_jni_factory.h"
+#include "chrome/browser/android/adblock/filtering_configuration_bindings_factory.h"
+#include "chrome/browser/android/adblock/resource_classification_notifier_bindings_factory.h"
#include "chrome/browser/android/explore_sites/explore_sites_service_factory.h"
#include "chrome/browser/android/reading_list/reading_list_manager_factory.h"
#include "chrome/browser/android/search_permissions/search_permissions_service.h"
@@ -635,9 +651,21 @@ void ChromeBrowserMainExtraPartsProfiles::
+#endif
+
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/android/auxiliary_search/auxiliary_search_provider.h"
#include "chrome/browser/android/metrics/android_session_durations_service_factory.h"
@@ -663,6 +682,20 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
ExitTypeServiceFactory::GetInstance();
#endif
@@ -7291,17 +7294,16 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+ adblock::ResourceClassificationRunnerFactory::GetInstance();
+ adblock::SessionStatsFactory::GetInstance();
+ adblock::SitekeyStorageFactory::GetInstance();
#if BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_ANDROID)
+ adblock::AdblockJNIFactory::GetInstance();
+ adblock::FilteringConfigurationBindingsFactory::GetInstance();
+ adblock::ResourceClassificationNotifierBindingsFactory::GetInstance();
explore_sites::ExploreSitesServiceFactory::GetInstance();
#endif
+ #endif
+ adblock::SubscriptionPersistentMetadataFactory::GetInstance();
+ adblock::SubscriptionServiceFactory::GetInstance();
FaviconServiceFactory::GetInstance();
feature_engagement::TrackerFactory::GetInstance();
feed::FeedServiceFactory::GetInstance();
#if BUILDFLAG(IS_ANDROID)
FastCheckoutCapabilitiesFetcherFactory::GetInstance();
#endif
diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chrome/browser/profiles/profile_keyed_service_browsertest.cc
--- a/chrome/browser/profiles/profile_keyed_service_browsertest.cc
+++ b/chrome/browser/profiles/profile_keyed_service_browsertest.cc
@@ -7316,7 +7318,7 @@ diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chro
#include <sstream>
#include "base/ranges/algorithm.h"
@@ -261,7 +265,7 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
@@ -263,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
"UkmBackgroundRecorderService",
"UsbDeviceManager",
"UsbDeviceResourceManager",
@@ -7325,7 +7327,7 @@ diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chro
};
// clang-format on
@@ -520,6 +524,17 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
@@ -532,6 +536,17 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
"feedback::FeedbackUploaderChrome",
"sct_reporting::Factory",
"ZeroSuggestCacheServiceFactory",
@@ -7421,7 +7423,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
import("//build/config/buildflags_paint_preview.gni")
import("//build/config/chromebox_for_meetings/buildflags.gni")
@@ -544,6 +548,7 @@ static_library("ui") {
@@ -551,6 +555,7 @@ static_library("ui") {
"//components/about_ui",
"//components/access_code_cast/common:metrics",
"//components/account_id",
@@ -7491,7 +7493,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/3pcd_heuristics/opener_heuristic_tab_helper.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h"
@@ -104,6 +112,7 @@
@@ -110,6 +118,7 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_isolated_world_ids.h"
#include "chrome/common/chrome_switches.h"
@@ -7499,7 +7501,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "components/autofill/content/browser/content_autofill_client.h"
#include "components/autofill/content/browser/content_autofill_driver_factory.h"
#include "components/autofill/core/browser/browser_autofill_manager.h"
@@ -329,6 +338,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -335,6 +344,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
web_contents, optimization_guide_decider, about_this_site_service);
}
#endif
@@ -7548,9 +7550,9 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
import("//chromeos/ash/components/assistant/assistant.gni")
+import("//components/adblock/features.gni")
import("//components/captive_portal/core/features.gni")
import("//components/enterprise/buildflags/buildflags.gni")
import("//components/feed/features.gni")
import("//components/lens/features.gni")
@@ -1051,6 +1055,7 @@ if (is_android) {
@@ -1053,6 +1057,7 @@ if (is_android) {
]
deps += [
@@ -7558,7 +7560,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/autofill/content/browser:test_support",
"//components/back_forward_cache:back_forward_cache",
"//components/browsing_data/core:core",
@@ -1459,6 +1464,7 @@ if (!is_android) {
@@ -1416,6 +1421,7 @@ if (!is_android) {
"//chrome/test/data/webui/mojo:mojo_bindings",
"//chrome/test/media_router/access_code_cast:access_code_cast_integration_base",
"//chrome/test/payments:test_support",
@@ -7566,7 +7568,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/autofill/content/browser:risk_proto",
"//components/autofill/content/browser:test_support",
"//components/autofill/content/common/mojom",
@@ -1765,6 +1771,7 @@ if (!is_android) {
@@ -1728,6 +1734,7 @@ if (!is_android) {
"data/",
"//ash/components/arc/test/data/icons",
"//chrome/browser/page_load_metrics/integration_tests/data/",
@@ -7574,7 +7576,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/test/data/cart/",
"//components/test/data/ad_tagging/",
"//components/test/data/ads_observer/",
@@ -1856,6 +1863,15 @@ if (!is_android) {
@@ -1819,6 +1826,15 @@ if (!is_android) {
"../browser/accessibility/image_annotation_browsertest.cc",
"../browser/accessibility/interstitial_accessibility_browsertest.cc",
"../browser/accessibility/page_colors_browsertest.cc",
@@ -7590,7 +7592,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/apps/guest_view/app_view_browsertest.cc",
"../browser/apps/guest_view/web_view_browsertest.cc",
"../browser/apps/platform_apps/app_browsertest.cc",
@@ -2553,6 +2569,10 @@ if (!is_android) {
@@ -2527,6 +2543,10 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
@@ -7601,7 +7603,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (enable_reporting) {
sources += [ "../browser/net/reporting_browsertest.cc" ]
}
@@ -5607,6 +5627,7 @@ test("unit_tests") {
@@ -5605,6 +5625,7 @@ test("unit_tests") {
# All unittests in browser, common, renderer and service.
"../browser/about_flags_unittest.cc",
"../browser/active_use_util_unittest.cc",
@@ -7609,7 +7611,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/after_startup_task_utils_unittest.cc",
"../browser/apps/icon_standardizer_unittest.cc",
"../browser/apps/user_type_filter_unittest.cc",
@@ -6219,6 +6240,8 @@ test("unit_tests") {
@@ -6224,6 +6245,8 @@ test("unit_tests") {
"//chrome/services/file_util:unit_tests",
"//chrome/services/qrcode_generator/public/cpp",
"//components/account_id",
@@ -7618,7 +7620,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/assist_ranker/proto",
"//components/autofill/content/browser:test_support",
"//components/background_sync",
@@ -9585,6 +9608,7 @@ if (!is_android) {
@@ -9578,6 +9601,7 @@ if (!is_android) {
public_deps = [
"//chrome/browser:test_support_ui",
@@ -7682,7 +7684,7 @@ diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_p
namespace {
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -559,8 +567,15 @@ void InProcessBrowserTest::CreatedBrowserMainParts(
@@ -551,8 +559,15 @@ void InProcessBrowserTest::CreatedBrowserMainParts(
void InProcessBrowserTest::SelectFirstBrowser() {
const BrowserList* browser_list = BrowserList::GetInstance();
@@ -9380,7 +9382,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
import("//base/debug/debug.gni")
import("//build/config/chrome_build.gni")
@@ -108,6 +111,14 @@ test("components_unittests") {
@@ -125,6 +128,14 @@ test("components_unittests") {
deps = [
"//base",
@@ -9395,7 +9397,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
"//components/aggregation_service:unit_tests",
"//components/apdu:unit_tests",
"//components/assist_ranker:unit_tests",
@@ -319,6 +330,7 @@ test("components_unittests") {
@@ -336,6 +347,7 @@ test("components_unittests") {
if (use_blink) {
deps += [
@@ -9403,7 +9405,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
"//components/autofill/content/browser:unit_tests",
"//components/autofill/content/renderer:unit_tests",
"//components/autofill/core/common/mojom:unit_tests",
@@ -1035,6 +1047,9 @@ if (use_blink) {
@@ -1061,6 +1073,9 @@ if (use_blink) {
deps = [
"//base",
@@ -164012,7 +164014,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow
#include "content/browser/loader/navigation_url_loader_impl.h"
#include <map>
@@ -967,7 +971,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect(
@@ -969,7 +973,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect(
LogQueueTimeHistogram("Navigation.QueueTime.OnReceiveRedirect",
resource_request_->is_outermost_main_frame);
net::Error error = net::OK;
@@ -164035,7 +164037,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
#include "content/browser/renderer_host/render_frame_host_impl.h"
@@ -2599,6 +2603,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
@@ -2592,6 +2596,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
std::move(callback));
}
@@ -164048,7 +164050,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
void RenderFrameHostImpl::ExecuteJavaScript(const std::u16string& javascript,
JavaScriptResultCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -10847,7 +10857,6 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryInternal(
@@ -10848,7 +10858,6 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryInternal(
GetProcess()->CreateURLLoaderFactory(std::move(default_factory_receiver),
std::move(params));
@@ -164070,7 +164072,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/br
#ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_
#define CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_
@@ -432,6 +436,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -433,6 +437,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
const std::u16string& method_name,
base::Value::List arguments,
JavaScriptResultCallback callback) override;
@@ -164095,7 +164097,7 @@ diff --git a/content/public/browser/render_frame_host.h b/content/public/browser
#ifndef CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_
#define CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_
@@ -496,6 +500,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
@@ -497,6 +501,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
virtual void AddMessageToConsole(blink::mojom::ConsoleMessageLevel level,
const std::string& message) = 0;
@@ -164188,7 +164190,7 @@ diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_
#include "extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h"
#include <memory>
@@ -450,6 +454,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect(
@@ -454,6 +458,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect(
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
if (redirect_url_ != redirect_info.new_url &&
@@ -164257,7 +164259,7 @@ diff --git a/third_party/blink/public/mojom/frame/frame.mojom b/third_party/blin
module blink.mojom;
@@ -843,6 +847,10 @@ interface LocalFrame {
@@ -844,6 +848,10 @@ interface LocalFrame {
// the given point in the view coordinate space.
PluginActionAt(gfx.mojom.Point location, blink.mojom.PluginActionType action);
@@ -164380,7 +164382,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b
#include "third_party/blink/renderer/core/frame/local_frame_mojo_handler.h"
@@ -361,6 +365,14 @@ LocalFrameMojoHandler::LocalFrameMojoHandler(blink::LocalFrame& frame)
@@ -356,6 +360,14 @@ LocalFrameMojoHandler::LocalFrameMojoHandler(blink::LocalFrame& frame)
WrapWeakPersistent(this)));
}
@@ -164409,7 +164411,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.h b/
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_FRAME_MOJO_HANDLER_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_FRAME_MOJO_HANDLER_H_
@@ -108,6 +112,7 @@ class LocalFrameMojoHandler
@@ -107,6 +111,7 @@ class LocalFrameMojoHandler
void AddMessageToConsole(mojom::blink::ConsoleMessageLevel level,
const WTF::String& message,
bool discard_duplicates) final;
build/patches/eyeo-beta-114.0.5735.53-v1-extension_api.patch
+5 -5
View File
@@ -2339,7 +2339,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac
#include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
#include "chrome/browser/extensions/api/history/history_api.h"
#include "chrome/browser/extensions/api/identity/identity_api.h"
@@ -64,6 +70,7 @@ namespace chrome_extensions {
@@ -68,6 +74,7 @@ namespace chrome_extensions {
void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() {
extensions::ActivityLogAPI::GetFactoryInstance();
@@ -2347,7 +2347,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac
extensions::AutofillPrivateEventRouterFactory::GetInstance();
extensions::BluetoothLowEnergyAPI::GetFactoryInstance();
extensions::BookmarksAPI::GetFactoryInstance();
@@ -73,6 +80,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() {
@@ -77,6 +84,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() {
extensions::CookiesAPI::GetFactoryInstance();
extensions::DeveloperPrivateAPI::GetFactoryInstance();
extensions::ExtensionActionAPI::GetFactoryInstance();
@@ -3626,7 +3626,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro
#include "components/autofill/core/common/autofill_prefs.h"
#include "components/bookmarks/common/bookmark_pref_names.h"
#include "components/browsing_data/core/pref_names.h"
@@ -174,6 +179,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
@@ -175,6 +180,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
return *s_allowlist;
s_allowlist = new PrefsUtil::TypedPrefMap();
@@ -4260,7 +4260,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -3370,6 +3370,12 @@ if (!is_android) {
@@ -3353,6 +3353,12 @@ if (!is_android) {
"//chrome/browser/extensions/api:native_messaging_test_echo_&_host",
]
}
@@ -5736,7 +5736,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
-->
<histogram-configuration>
@@ -33879,7 +33882,7 @@ Called by update_extension_histograms.py.-->
@@ -34788,7 +34791,7 @@ Called by update_extension_histograms.py.-->
<int value="19" label="APP_WINDOW_ON_MAXIMIZED"/>
<int value="20" label="APP_WINDOW_ON_MINIMIZED"/>
<int value="21" label="APP_WINDOW_ON_RESTORED"/>
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+75 -46
View File
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../android/metrics/uma_session_stats.cc | 10 -
.../android/signin/signin_manager_android.cc | 27 +-
chrome/browser/browser_process_impl.cc | 1 -
.../browser/chrome_content_browser_client.cc | 26 --
.../browser/chrome_content_browser_client.cc | 35 --
.../domain_reliability/service_factory.cc | 33 +-
chrome/browser/extensions/BUILD.gn | 1 -
.../log_sources/chrome_internal_log_source.cc | 5 -
@@ -55,15 +55,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/search_provider_logos/BUILD.gn | 2 -
.../logo_service_impl.cc | 16 +-
components/url_matcher/url_util.cc | 83 -----
.../webid/identity_url_loader_throttle.cc | 2 +-
content/public/common/content_features.cc | 12 +-
net/base/url_util.cc | 21 --
services/network/network_context.cc | 2 +-
51 files changed, 56 insertions(+), 790 deletions(-)
51 files changed, 61 insertions(+), 804 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -990,10 +990,6 @@ static_library("browser") {
@@ -1000,10 +1000,6 @@ static_library("browser") {
"page_load_metrics/observers/foreground_duration_ukm_observer.h",
"page_load_metrics/observers/formfill_page_load_metrics_observer.cc",
"page_load_metrics/observers/formfill_page_load_metrics_observer.h",
@@ -74,7 +74,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"page_load_metrics/observers/histogram_suffixes.cc",
"page_load_metrics/observers/histogram_suffixes.h",
"page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc",
@@ -1882,7 +1878,6 @@ static_library("browser") {
@@ -1894,7 +1890,6 @@ static_library("browser") {
"//chrome/browser/autofill",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/profiling_host",
# TODO(crbug.com/1335199): break this dep when favicon is in its own target
@@ -1906,7 +1901,6 @@ static_library("browser") {
@@ -1918,7 +1913,6 @@ static_library("browser") {
public_deps = [
"//base",
@@ -90,7 +90,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/headless",
"//chrome/common",
"//chrome/common:buildflags",
@@ -7539,8 +7533,6 @@ static_library("browser") {
@@ -7554,8 +7548,6 @@ static_library("browser") {
"supervised_user/kids_chrome_management/kids_profile_manager.h",
"supervised_user/supervised_user_browser_utils.cc",
"supervised_user/supervised_user_browser_utils.h",
@@ -122,7 +122,7 @@ diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browse
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -56,29 +56,10 @@ class ProfileDataRemover : public content::BrowsingDataRemover::Observer {
@@ -58,29 +58,10 @@ class ProfileDataRemover : public content::BrowsingDataRemover::Observer {
remover_(profile->GetBrowsingDataRemover()) {
remover_->AddObserver(this);
@@ -159,7 +159,7 @@ diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/br
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
@@ -1120,7 +1120,6 @@ BrowserProcessImpl::component_updater() {
@@ -1098,7 +1098,6 @@ BrowserProcessImpl::component_updater() {
std::make_unique<component_updater::TimerUpdateScheduler>();
std::string brand;
@@ -170,7 +170,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
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
@@ -2907,7 +2907,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2919,7 +2919,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kForcePNaClSubzero,
#endif
switches::kForceUIDirection,
@@ -178,7 +178,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
switches::kJavaScriptHarmony,
switches::kEnableExperimentalWebAssemblyFeatures,
embedder_support::kOriginTrialDisabledFeatures,
@@ -4932,12 +4931,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4975,12 +4974,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
@@ -191,32 +191,48 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
if (auto* throttle_manager =
subresource_filter::ContentSubresourceFilterThrottleManager::
FromNavigationHandle(*handle)) {
@@ -5499,25 +5492,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
@@ -5594,20 +5587,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
GetPrerenderCanceler(wc_getter)));
}
#endif
- chrome::mojom::DynamicParamsPtr dynamic_params =
- chrome::mojom::DynamicParams::New(
-#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
- std::move(bound_session_params),
-#endif
- profile->GetPrefs()->GetBoolean(
- policy::policy_prefs::kForceGoogleSafeSearch),
- profile->GetPrefs()->GetInteger(
- policy::policy_prefs::kForceYouTubeRestrict),
- profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps));
- result.push_back(std::make_unique<GoogleURLLoaderThrottle>(
-#if BUILDFLAG(IS_ANDROID)
- client_data_header,
- auto [client_data_header, is_custom_tab] =
- GetClientDataHeader(frame_tree_node_id);
-#endif
-#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
- std::move(bound_session_request_throttled_listener),
-
- if (auto google_throttle = CreateGoogleURLLoaderThrottle(
-#if BUILDFLAG(IS_ANDROID)
- client_data_header,
-#endif
- std::move(dynamic_params)));
- profile);
- google_throttle) {
- result.push_back(std::move(google_throttle));
- }
-
{
auto* factory =
ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context);
@@ -5661,20 +5640,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
}
#endif
-#if BUILDFLAG(IS_ANDROID)
- auto [client_data_header, unused_is_custom_tab] =
- GetClientDataHeader(frame_tree_node_id);
-#endif
-
- if (auto google_throttle = CreateGoogleURLLoaderThrottle(
-#if BUILDFLAG(IS_ANDROID)
- client_data_header,
-#endif
- profile);
- google_throttle) {
- result.push_back(std::move(google_throttle));
- }
-
return result;
}
diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/browser/domain_reliability/service_factory.cc
--- a/chrome/browser/domain_reliability/service_factory.cc
+++ b/chrome/browser/domain_reliability/service_factory.cc
@@ -600,7 +616,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metri
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
--- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
@@ -121,8 +121,6 @@ void PageLoadMetricsEmbedder::RegisterEmbedderObservers(
@@ -122,8 +122,6 @@ void PageLoadMetricsEmbedder::RegisterEmbedderObservers(
tracker->AddObserver(std::make_unique<AMPPageLoadMetricsObserver>());
tracker->AddObserver(std::make_unique<JavascriptFrameworksUkmObserver>());
tracker->AddObserver(std::make_unique<SchemePageLoadMetricsObserver>());
@@ -637,7 +653,7 @@ diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chro
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -508,7 +508,6 @@ static_library("ui") {
@@ -519,7 +519,6 @@ static_library("ui") {
"//chrome/browser/companion/core",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -686,7 +702,7 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/b
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -130,8 +130,6 @@ static_library("common_lib") {
@@ -138,8 +138,6 @@ static_library("common_lib") {
"content_restriction.h",
"crash_keys.cc",
"crash_keys.h",
@@ -698,9 +714,9 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -1559,9 +1559,9 @@ BASE_FEATURE(kUseWebAppDBInsteadOfExternalPrefs,
"UseWebAppDBInsteadOfExternalPrefs",
@@ -1539,9 +1539,9 @@ BASE_FEATURE(kSupportsRtcWakeOver24Hours,
base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-BASE_FEATURE(kWebAuthFlowInBrowserTab,
- "WebAuthFlowInBrowserTab",
@@ -746,7 +762,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6177,7 +6177,6 @@ test("unit_tests") {
@@ -6180,7 +6180,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",
@@ -1589,18 +1605,31 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti
return GURL();
}
diff --git a/content/common/webid/identity_url_loader_throttle.cc b/content/common/webid/identity_url_loader_throttle.cc
--- a/content/common/webid/identity_url_loader_throttle.cc
+++ b/content/common/webid/identity_url_loader_throttle.cc
@@ -35,7 +35,7 @@ bool IsFedCmIdpSigninStatusThrottleEnabled() {
GetFieldTrialParamByFeatureAsBool(
features::kFedCm,
features::kFedCmIdpSigninStatusMetricsOnlyFieldTrialParamName,
- true);
+ false);
}
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -448,15 +448,15 @@ BASE_FEATURE(kFedCmLoginHint,
// Enables metrics collection for signin status mismatches. Also enables
// parsing the signin status HTTP headers.
// kFedCmIdpSigninStatusEnabled takes precedence over this feature flag.
-BASE_FEATURE(kFedCmIdpSigninStatusMetrics,
- "FedCmIdpSigninStatusMetrics",
- base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kFedCmIdpSigninStatusMetrics, // disabled
+ "FedCmIdpSigninStatusMetrics", // by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // on bromite
} // namespace
// Enables the IDP signin status API for use with FedCM, including avoiding
// network requests when not signed in and mismatch handling.
-BASE_FEATURE(kFedCmIdpSigninStatusEnabled,
- "FedCmIdpSigninStatusEnabled",
- base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kFedCmIdpSigninStatusEnabled, // disabled
+ "FedCmIdpSigninStatusEnabled", // by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // on bromite
// Enables the MDocs API in the IdentityCredential.
BASE_FEATURE(kWebIdentityMDocs,
diff --git a/net/base/url_util.cc b/net/base/url_util.cc
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -1635,7 +1664,7 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -2643,7 +2643,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2663,7 +2663,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
}
#endif // BUILDFLAG(IS_CT_SUPPORTED)