Merge pull request #12804 from brave/100.0.4896.56_1.38.x

Upgrade from Chromium 100.0.4896.56 to Chromium 100.0.4896.60 (uplift to 1.38.x)
brave · Mar 29, 2022 · 584fad2 · 584fad2
2 parents 555aa28 + 07de132
commit 584fad2
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 29 deletions.
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -13,6 +13,7 @@
 #include "components/component_updater/component_updater_switches.h"
 #include "components/embedder_support/switches.h"
 #include "components/language/core/common/language_experiments.h"
+#include "components/lens/lens_features.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/omnibox/common/omnibox_features.h"
 #include "components/optimization_guide/core/optimization_guide_features.h"
@@ -84,10 +85,8 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, OriginTrialsTest) {
 }
 
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
+  // Please, keep alphabetized
   const base::Feature* disabled_features[] = {
-#if !BUILDFLAG(IS_ANDROID)
-    &translate::kTFLiteLanguageDetectionEnabled,
-#endif
     &autofill::features::kAutofillEnableAccountWalletStorage,
     &autofill::features::kAutofillServerCommunication,
     &blink::features::kAdInterestGroupAPI,
@@ -110,11 +109,11 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &features::kFirstPartySets,
     &features::kIdleDetection,
     &features::kNotificationTriggers,
-    &privacy_sandbox::kPrivacySandboxSettings3,
     &features::kOmniboxTriggerForNoStatePrefetch,
     &features::kSignedExchangeSubresourcePrefetch,
     &features::kSubresourceWebBundles,
     &features::kWebOTP,
+    &lens::features::kLensStandalone,
     &media::kLiveCaption,
     &net::features::kPartitionedCookies,
     &network::features::kTrustTokens,
@@ -124,7 +123,11 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
     &optimization_guide::features::
         kRemoteOptimizationGuideFetchingAnonymousDataConsent,
     &permissions::features::kPermissionOnDeviceNotificationPredictions,
+    &privacy_sandbox::kPrivacySandboxSettings3,
     &reading_list::switches::kReadLater,
+#if !BUILDFLAG(IS_ANDROID)
+    &translate::kTFLiteLanguageDetectionEnabled,
+#endif
   };
 
   for (const auto* feature : disabled_features)

diff --git a/chromium_src/components/lens/lens_features.cc b/chromium_src/components/lens/lens_features.cc
@@ -12,7 +12,6 @@ namespace features {
 
 OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kLensStandalone, base::FEATURE_DISABLED_BY_DEFAULT},
-    {kLensRegionSearch, base::FEATURE_DISABLED_BY_DEFAULT},
 }});
 
 }  // namespace features

diff --git a/package.json b/package.json
@@ -255,7 +255,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "100.0.4896.46",
+        "tag": "100.0.4896.60",
         "repository": {
           "url": "https://github.com/chromium/chromium"
         }

diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch
@@ -1,8 +1,8 @@
 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index 5ae36846fdb15f6b0adc2e62c3e00ab3b027db51..4ca138eca0bc9df0ea68e5d55c8202dd206522ee 100644
+index a149a6ab313c49c423d1f2da616265b97cf139f4..8bd3e42b5df2cebfced040e0f49f350ad2e2b443 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
-@@ -548,6 +548,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
+@@ -550,6 +550,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
    ScopedAllowBaseSyncPrimitives& operator=(
        const ScopedAllowBaseSyncPrimitives&) = delete;
 

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index c4e74fc04cc23d5f65a07f320468bebf0ca87bba..9e92033d81b0624a4ac5dc7f5154583df62f6ed2 100644
+index ee1b58165dd36442bb9c45dd0e04283185cd8961..6e19a19b7617484efd772f381859d8505602fb85 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=100
 -MINOR=0
 -BUILD=4896
--PATCH=46
+-PATCH=60
 +MINOR=1
 +BUILD=38
 +PATCH=73
diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-index 2b973c858de96d56641914b91cfaaa22d2c0062c..29ab4975671ac0d274302d97fad41d819dabc2a8 100644
+index 2fb1438ef65b601035e5b953b5e9f7d5195075fa..c0ac3e394e539170984c3971aa5ff8ffdece83e0 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -402,7 +402,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -403,7 +403,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      private SubscriptionsManager mSubscriptionsManager;
 
      protected ChromeActivity() {

diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 560930c0979caa88b069d6986f0f31066860d0cb..185ee5ee74baf4aadf146af1729215d78db43324 100644
+index 9917fcf771ecbfceaba4c02164de620d2aaf0775..74d24482a419119a29cea97fcaa39cc41762ff5d 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2541,6 +2541,7 @@ static_library("browser") {

diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 595b892c2553eff52c141f1278986efbc63508fd..b22887b9a769cf133fee8f6d4689a2cfb367b0d5 100644
+index 81876b3c1a1576af78b919b00ad05e96c9a29394..6d333d7d63494b1d38c11aa69509769b3b1a3d2e 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -2855,6 +2855,7 @@ const FeatureEntry::FeatureVariation kGridTabSwitcherForTabletsVariations[] = {
+@@ -2865,6 +2865,7 @@ constexpr FeatureEntry::FeatureVariation kLensStandaloneVariations[] = {
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {

diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
-index 2c629b221ca065c99f517235e14b5399d4c35f2f..ea7d29cfd3e5b788c33f1fcc60a04fd1a9393c23 100644
+index 061be5e87c32e10f7fbe7e5c2e075b018fd02f7d..b939692c90f4056e787db16cd5962aae6321de8d 100644
 --- a/chrome/browser/extensions/BUILD.gn
 +++ b/chrome/browser/extensions/BUILD.gn
-@@ -1343,6 +1343,7 @@ static_library("extensions") {
+@@ -1338,6 +1338,7 @@ static_library("extensions") {
    } else {
      sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
    }

diff --git a/patches/chrome-browser-notifications-BUILD.gn.patch b/patches/chrome-browser-notifications-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn
-index 9d9527bb8461e0ab94f5280aecacd5caebfe60ab..1d9116f5dd374f6c7008cf108f8598b1e0fb7ca3 100644
+index 9d9527bb8461e0ab94f5280aecacd5caebfe60ab..1fb149984cc446e04163cb51fca3dc46a9809b3c 100644
 --- a/chrome/browser/notifications/BUILD.gn
 +++ b/chrome/browser/notifications/BUILD.gn
 @@ -80,6 +80,7 @@ if (is_android) {

diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index bd0c693804407b5b40ec3da3a61496000e2a0710..ab0ebe32e468efc680abb59139dc04b038abaf23 100644
+index 7a216c9ffb4d7c5a9c228458884e84281fd299c4..9703145283542190bd8650d4afd222612ba8eefb 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
 @@ -362,7 +362,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,

diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index 1301f3baf5b7fa337def7052098b70894e1b788c..68b75d448802f88c4889007a16bb393e99b5a0b3 100644
+index 3063256f8922f792d7a4f5fd6c8f77d56bf94b5f..19427498ccce4d5f7c6c85572b786ff4a89ee4a3 100644
 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
 @@ -1834,6 +1834,7 @@ void RenderViewContextMenu::AppendSearchProvider() {

diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index 86052568f45c38d57b42bb4e4a0a0da4cf28c36e..4581143e5e3aa15ff4556858c8845c8c832fa8cf 100644
+index 1d4989dedf33ba526eb4d07ff578281194c8d3be..57b6b71bd7b9b9620abd466b96d4c1198d3c8516 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -596,4 +596,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -594,4 +594,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
 
    // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and
    // organized.

diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index e241a085d433fc2dadf54729c2f497085239fd4b..50c725d0e5bc08f55ac84603111e0168c0c96baa 100644
+index 768da31eb760ed382465f65bf34589f7e8dd794d..37af2a42d72ce17fe9413ded36d6b24b4b3d5477 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -303,6 +303,7 @@ static_library("test_support") {

diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
-index 5a7fa871f7b26dfbc767e1ba0d8ecc60d557e57e..d2b6e19aa62165f6be423ed48fc5aaac1131bc40 100644
+index 933385d5329239399fbefdf992cab49412f406a8..2bf03d24aff7668544bd62687dd1aeb37e931eaf 100644
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -2556,6 +2556,7 @@ void NavigationRequest::OnRequestRedirected(
+@@ -2558,6 +2558,7 @@ void NavigationRequest::OnRequestRedirected(
    common_params_->url = redirect_info.new_url;
    common_params_->method = redirect_info.new_method;
    common_params_->referrer->url = GURL(redirect_info.new_referrer);
 +  BRAVE_ONREQUESTREDIRECTED_MAYBEHIDEREFERRER
    common_params_->referrer = Referrer::SanitizeForRequest(
        common_params_->url, *common_params_->referrer);
 
-@@ -3819,6 +3820,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -3821,6 +3822,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
 

diff --git a/patches/services-network-cookie_manager.cc.patch b/patches/services-network-cookie_manager.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/services/network/cookie_manager.cc b/services/network/cookie_manager.cc
-index f5df9b6c27e9faa2ac831cf0a60be75c9db98ecf..00e410ba479461684fba51945b734a3f0d2e2c8f 100644
+index 49c53dc75789f4d84675189844bcd89322140865..2b7aa6e3d6a2c26a7e70f5b47a3af547aca75b4a 100644
 --- a/services/network/cookie_manager.cc
 +++ b/services/network/cookie_manager.cc
 @@ -433,6 +433,7 @@ CookieDeletionInfo DeletionFilterToInfo(mojom::CookieDeletionFilterPtr filter) {

diff --git a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
-index e6d41069e1d76f330364e0e0abc9f8a7536befcc..320550f3e9ff79ef12305002197c4f1ebdf62183 100644
+index 3ebe2d88e193c8e8e5e13a7bff96f301abfed52c..90980ed21abc9af83e772bddae9eafd53aa9bf27 100644
 --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
 +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc
-@@ -82,6 +82,7 @@ std::unique_ptr<net::CanonicalCookie> ToCanonicalCookie(
+@@ -84,6 +84,7 @@ std::unique_ptr<net::CanonicalCookie> ToCanonicalCookie(
    base::Time expires = options->hasExpiresNonNull()
                             ? base::Time::FromJavaTime(options->expiresNonNull())
                             : base::Time();

diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -788,6 +788,7 @@ if (!is_android) {
       "//brave/vendor/bat-native-ledger",
       "//brave/vendor/bat-native-ledger:publishers_proto",
       "//chrome/browser",
+      "//components/lens",
       "//components/metrics_services_manager",
       "//components/optimization_guide/core",
       "//components/permissions:permissions_common",
@@ -1094,6 +1095,7 @@ if (!is_android) {
       "//components/externalauth/android:google_delegate_public_impl_java",
       "//components/language/android:ulp_delegate_public_java",
       "//components/language/core/common",
+      "//components/lens",
       "//components/network_time",
       "//components/optimization_guide/core",
       "//components/privacy_sandbox",