Commit 453791f1 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Browser: Bump to version 100.0.4896.57


Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent 1a4d0086
Pipeline #174986 passed with stages
in 544 minutes and 18 seconds
bromite @ 692764d0
Subproject commit 47d0d4f9f8e3443a2204f7bbebcd83b068d6debd
Subproject commit 692764d0733a5a3d62e383cd4b8d378d611cdf24
......@@ -4,11 +4,10 @@
0004-Browser-Point-to-our-default-popular-sites.patch
0005-Browser-Enable-do-not-track-by-default.patch
0006-Browser-Add-provider-to-share-default-search-engine.patch
0007-Browser-Disable-async-DNS-by-default-on-Android.patch
0008-Browser-Enable-custom-tabs-by-default.patch
0009-Browser-Enable-search-suggestion-by-default.patch
0010-Browser-Modify-default-search-engines.patch
0011-Browser-Redirect-users-to-e-foundation-docs.patch
0012-Revert-Bromite-auto-updater.patch
0013-Revert-Block-gateway-attacks-via-websockets.patch
0014-Revert-Disable-unified-autoplay-feature.patch
0007-Browser-Enable-custom-tabs-by-default.patch
0008-Browser-Enable-search-suggestion-by-default.patch
0009-Browser-Modify-default-search-engines.patch
0010-Browser-Redirect-users-to-e-foundation-docs.patch
0011-Revert-Bromite-auto-updater.patch
0012-Revert-Block-gateway-attacks-via-websockets.patch
0013-Revert-Disable-unified-autoplay-feature.patch
From 1a9bc10a81de7705467f7c3a745b811eef40efa2 Mon Sep 17 00:00:00 2001
From 8aefc955dec1242bc7671d961f3fca2661bdacd7 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: [PATCH 01/14] Browser: Change app and package name to browser
Subject: [PATCH 01/13] Browser: Change app and package name to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -10,10 +10,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 4058341db4cdd..5ac0eb1185ebb 100644
index db951d4f1470a..0697a16792cf2 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
@@ -44,16 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
assert(current_toolchain != android_secondary_abi_toolchain)
}
......@@ -31,7 +31,7 @@ index 4058341db4cdd..5ac0eb1185ebb 100644
declare_args() {
# Android package name to use when compiling the public chrome targets
@@ -64,7 +55,7 @@ declare_args() {
@@ -65,7 +56,7 @@ declare_args() {
# for details.
chrome_public_manifest_package = _default_package
}
......
From c23ad1b3371d620411b20a1659b411b7e2073185 Mon Sep 17 00:00:00 2001
From 3bfd9c07913dbc4e9129f53449c0d856dd3f28d1 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:12:30 +0000
Subject: [PATCH 03/14] Browser: Rename strings to browser
Subject: [PATCH 03/13] Browser: Rename strings to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -81,7 +81,7 @@ index 68f0aab29c05d..1808959db4eb9 100644
android:key="application_version"
android:title="@string/application_version_title" />
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
index 9ffac62f8eba4..96b71187ea2f0 100644
index 82e16ba250327..d404521b5cba3 100644
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -110,6 +110,6 @@
......@@ -172,7 +172,7 @@ index e92bc2b2739c2..af6d85d9da4cd 100644
.with(MessageBannerProperties.PRIMARY_BUTTON_TEXT,
resources.getString(R.string.auto_dark_message_button))
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 09c7ba8a1671c..2f9a418e092de 100644
index 09dbbf7ac668d..af8fdbc61351a 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -198,6 +198,8 @@ CHAR_LIMIT guidelines:
......
From be0460c7a12a508b2c033e6bd9c4c0636d290dda Mon Sep 17 00:00:00 2001
From 2fa7ca2f795dc034501c6d6231668a58b1a71330 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:29:59 +0000
Subject: [PATCH 04/14] Browser: Point to our default popular sites
Subject: [PATCH 04/13] Browser: Point to our default popular sites
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From e6eeb49dd5c4878daf41b6bcd419b348254e7fde Mon Sep 17 00:00:00 2001
From 1c2531bb6e1354cce238ae1b20d13cf0041c7a82 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:34:57 +0000
Subject: [PATCH 05/14] Browser: Enable do not track by default
Subject: [PATCH 05/13] Browser: Enable do not track by default
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -9,7 +9,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 97737bfa6947a..a7274e387abdc 100644
index 81c32af81d6a5..868d0d3e9b603 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -88,7 +88,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
......
From 82e95e3c430b9de98d35e8d54be4f6f6791420ab Mon Sep 17 00:00:00 2001
From 0ce1b87a84dda67444c50e735d09fdb01ba8b2f0 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: [PATCH 06/14] Browser: Add provider to share default search engine
Subject: [PATCH 06/13] Browser: Add provider to share default search engine
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -12,10 +12,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index f64b00cd6a00d..3f5dd2260e797 100644
index c5e9e64823521..16c2479ac3019 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1273,6 +1273,12 @@ by a child template that "extends" this file.
@@ -1259,6 +1259,12 @@ by a child template that "extends" this file.
android:readPermission="android.permission.GLOBAL_SEARCH" />
</provider>
......
From 1a8bf5720449c80742f62a8d7b159ffa229653b2 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:26:03 +0000
Subject: [PATCH 07/14] Browser: Disable async DNS by default on Android
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
chrome/common/chrome_features.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 87ce25455617c..36ac9726037ed 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -105,7 +105,7 @@ const base::Feature kArcPiGhostWindow{"ArcPiGhostWindow",
// Enables the built-in DNS resolver.
const base::Feature kAsyncDns {
"AsyncDns",
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
--
2.25.1
From ce22f4473bfd8f6d743fc3a43beb2aaa393eb297 Mon Sep 17 00:00:00 2001
From bbeef442401a2b4ea85c0d1698fd56fbe4cdbef9 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:37:37 +0000
Subject: [PATCH 08/14] Browser: Enable custom tabs by default
Subject: [PATCH 07/13] Browser: Enable custom tabs by default
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
......
From 1240045afc0eeb9984aae658229b094b7ae89e84 Mon Sep 17 00:00:00 2001
From 8da94cb4b036764ee70399523f33cf1f8946023f Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:39:21 +0000
Subject: [PATCH 09/14] Browser: Enable search suggestion by default
Subject: [PATCH 08/13] Browser: Enable search suggestion by default
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
......@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 4e8e8ef6ca3f0..d7f0e395c8471 100644
index ac4c9d25ccd8b..c196f5d2fe85a 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -277,7 +277,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
@@ -275,7 +275,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
......
From a9ff10ba51d21464cfc9f4043ae3f4edde64a34e Mon Sep 17 00:00:00 2001
From b8b9c69eadda5428b758be90cde4be89ad88a1fb Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:42:44 +0100
Subject: [PATCH 10/14] Browser: Modify default search engines
Subject: [PATCH 09/13] Browser: Modify default search engines
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -94,10 +94,10 @@ index f0ee14d25c73a..9aa4ca1056519 100644
LocaleTemplateUrlLoader(const LocaleTemplateUrlLoader&) = delete;
LocaleTemplateUrlLoader& operator=(const LocaleTemplateUrlLoader&) = delete;
diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java
index 8afdf8a188da6..91e38d859ded6 100644
index b9d3925f030c9..416a8a7834852 100644
--- a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java
+++ b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java
@@ -155,7 +155,6 @@ public class LocaleManagerDelegate {
@@ -154,7 +154,6 @@ public class LocaleManagerDelegate {
*/
private void revertDefaultSearchEngineOverride() {
if (!isSearchEngineAutoSwitchEnabled() || isSpecialLocaleEnabled()) return;
......@@ -188,7 +188,7 @@ index ecbd15614ef0a..20b6bc09e1029 100644
// First check the main search URL.
if (SameDomain(
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 67419c17e3f9c..cc0ab0633f0eb 100644
index 44784f4915414..78bd426a5fbb8 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -29,9 +29,7 @@ namespace {
......
From d444af088c0e718f90113010351ec91250bab1fd Mon Sep 17 00:00:00 2001
From 657c1971c631d686671672be542beb8fdd5341ba Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 11 May 2021 14:22:00 +0200
Subject: [PATCH 11/14] Browser: Redirect users to e foundation docs
Subject: [PATCH 10/13] Browser: Redirect users to e foundation docs
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From 98ec13102d94e8c21b4a2f6db8366c3a523a8ebc Mon Sep 17 00:00:00 2001
From 423353cc76ffd606fd838746c989221f0d8ad014 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 22 Mar 2022 08:33:34 +0000
Subject: [PATCH 12/14] Revert "Bromite auto updater"
Date: Fri, 1 Apr 2022 11:47:29 +0000
Subject: [PATCH 11/13] Revert "Bromite auto updater"
This reverts commit 58a8f31d01b833437080ecdfb48cffbd12602a59.
This reverts commit ee027318d68d6aed17a8f130b1b323cc05bd8ef0.
---
.../java/templates/BuildConfig.template | 2 -
build/config/android/rules.gni | 3 -
......@@ -45,10 +45,10 @@ index 68b023ab9e010..8953ad5ca1775 100644
- public static MAYBE_FINAL String BUILD_TARGET_CPU = _BUILD_TARGET_CPU;
}
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 210487e0f18c8..6c67ac93f8bfc 100644
index ea439c21ff826..c992574f9f2e1 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1975,9 +1975,6 @@ if (enable_java_templates) {
@@ -1981,9 +1981,6 @@ if (enable_java_templates) {
]
}
}
......@@ -59,10 +59,10 @@ index 210487e0f18c8..6c67ac93f8bfc 100644
}
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 02df4dd5b9121..f52e41f69039b 100644
index a6d0563fc27cd..a060e3f2456e7 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -802,9 +802,6 @@ chrome_java_sources = [
@@ -804,9 +804,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
"java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
"java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
......@@ -310,7 +310,7 @@ index 700aa4c218c8c..e992298f27051 100644
+}
\ No newline at end of file
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
index edefafd4faf15..0a3da975789f2 100644
index 34166737bd7c5..0a3da975789f2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
@@ -11,7 +11,6 @@ import android.text.TextUtils;
......@@ -401,7 +401,7 @@ index edefafd4faf15..0a3da975789f2 100644
- case UpdateState.INLINE_UPDATE_DOWNLOADING:
- mMenuUiState.itemState = new MenuItemState();
- mMenuUiState.itemState.title = R.string.menu_inline_update_downloading;
- mMenuUiState.itemState.titleColorId = R.color.default_text_color_secondary;
- mMenuUiState.itemState.titleColorId = R.color.default_text_color_secondary_dark;
- break;
- case UpdateState.INLINE_UPDATE_READY:
- mMenuUiState.itemState = new MenuItemState();
......@@ -1528,18 +1528,18 @@ index a7bd35381ccd1..0000000000000
- }
-}
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index fc6c8291bf491..596517fd2c797 100644
index a5ad56a862dd0..798695f190d55 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -252,7 +252,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kNewWindowAppMenu,
&kOfflineIndicatorV2,
&kOfflineMeasurementsBackgroundTask,
- &kInlineUpdateFlow,
&kPageAnnotationsService,
- &kInlineUpdateFlow,
&kBookmarksImprovedSaveFlow,
&kBookmarksRefresh,
@@ -683,9 +682,6 @@ const base::Feature kIncognitoReauthenticationForAndroid{
&kProbabilisticCryptidRenderer,
@@ -686,9 +685,6 @@ const base::Feature kIncognitoReauthenticationForAndroid{
const base::Feature kIncognitoScreenshot{"IncognitoScreenshot",
base::FEATURE_DISABLED_BY_DEFAULT};
......@@ -1550,10 +1550,10 @@ index fc6c8291bf491..596517fd2c797 100644
base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
index a8b2f0dec0bc2..304f366a0f11c 100644
index 3062304db9059..2c3c2dafc0ad0 100644
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -111,7 +111,6 @@ extern const base::Feature kImmersiveUiMode;
@@ -109,7 +109,6 @@ extern const base::Feature kImmersiveUiMode;
extern const base::Feature kIncognitoReauthenticationForAndroid;
extern const base::Feature kIncognitoScreenshot;
extern const base::Feature kImprovedA2HS;
......@@ -1562,10 +1562,10 @@ index a8b2f0dec0bc2..304f366a0f11c 100644
extern const base::Feature kInstanceSwitcher;
extern const base::Feature kInstantStart;
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
index 1b25feb6e4760..92b6da65b5151 100644
index 454e18116fad0..2c9e4d8ad6c0e 100644
--- 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
@@ -367,7 +367,6 @@ public abstract class ChromeFeatureList {
@@ -366,7 +366,6 @@ public abstract class ChromeFeatureList {
public static final String INCOGNITO_REAUTHENTICATION_FOR_ANDROID =
"IncognitoReauthenticationForAndroid";
public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
......@@ -1574,10 +1574,10 @@ index 1b25feb6e4760..92b6da65b5151 100644
public static final String INSTANCE_SWITCHER = "InstanceSwitcher";
public static final String INSTANT_START = "InstantStart";
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 2f9a418e092de..d78f319433e9b 100644
index af8fdbc61351a..20cb660547262 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1790,12 +1790,6 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1839,12 +1839,6 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
Chrome updates are no longer supported for this version of Android
</message>
......@@ -1590,7 +1590,7 @@ index 2f9a418e092de..d78f319433e9b 100644
<!-- Account management UI strings. -->
<message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
@@ -3343,10 +3337,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3332,10 +3326,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<!-- Main menu items -->
<message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
......@@ -1602,7 +1602,7 @@ index 2f9a418e092de..d78f319433e9b 100644
</message>
<message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
Newer version is available
@@ -3357,18 +3348,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3346,18 +3337,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
Android version is unsupported
</message>
......
From 07964b031c5a851e61c139f0550945eebc84c88d Mon Sep 17 00:00:00 2001
From 8e120aa0470ed9c9967787dd630aca7e0e02bfa3 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 22 Mar 2022 08:34:04 +0000
Subject: [PATCH 13/14] Revert "Block gateway attacks via websockets"
Subject: [PATCH 12/13] Revert "Block gateway attacks via websockets"
This reverts commit eed9daba155d6440f85a55d4ebbf4da3914eedde.
---
......@@ -29,10 +29,10 @@ index 5a560cf29b2c6..36997bb271d63 100644
CreateWebSocketHandshakeThrottle() = 0;
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
index ffc606a8ba30b..8628f3abad5fa 100644
index dae7e3d0cea4b..c0b819535f1ef 100644
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -550,26 +550,6 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
@@ -558,26 +558,6 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
return should_block_request;
}
......@@ -60,7 +60,7 @@ index ffc606a8ba30b..8628f3abad5fa 100644
const ResourceRequest& resource_request,
const ResourceLoaderOptions& options,
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
index 2d0e2babca247..183200f2f8944 100644
index 4c1e572df5ab2..06e0907b666d0 100644
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
@@ -178,7 +178,6 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
......
From a03ac3483daaea85b274ab3ecf5e6866f50872fc Mon Sep 17 00:00:00 2001
From 56a2259f1167e8defc5ab0e0048ca07a37f3694e Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 22 Mar 2022 08:34:28 +0000
Subject: [PATCH 14/14] Revert "Disable unified autoplay feature"
Subject: [PATCH 13/13] Revert "Disable unified autoplay feature"
This reverts commit a2e273b85e59dc44fb312047ca0cc07692114d3b.
---
......@@ -9,10 +9,10 @@ This reverts commit a2e273b85e59dc44fb312047ca0cc07692114d3b.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 4697da29f5282..7789798822dd0 100644
index 656f1aa83e03f..e210d524f4658 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -464,7 +464,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
@@ -469,7 +469,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
// Enables the Unified Autoplay policy by overriding the platform's default
// autoplay policy.
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment