Merge pull request #2448 from brave/74.0.3729.157_0.64.x_23

Upgrade patches from Chromium 74.0.3729.131 to Chromium 74.0.3729.157

app/generated_resources.grd

@@ -4681,6 +4681,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_MD" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Brave is the default search engine, and the Material Design UI is enabled.">
         Search Brave or type a URL
       </message>
+      <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_SHORT" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, Brave is the default search engine, and short hint text is enabled.">
+        Search Brave
+      </message>
       <message name="IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP" desc="The tooltip for adding a custom link shortcut. (On the New Tab Page)">
         Add shortcut
       </message>

patches/chrome-VERSION.patch

@@ -1,11 +1,11 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index a9d23f5e048eea2a794ed5e51524fa51c326f611..83ede5bb865fdbda42deef9475617d09da99ba26 100644
+index aebc46bf525027c1a91c416ce45d4effb8d5e2b8..84d0b51b99d77fe696e46e6e98e6445a6b67d8cb 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=74
  MINOR=0
 -BUILD=3729
--PATCH=131
+-PATCH=157
 +BUILD=64
 +PATCH=75

patches/chrome-app-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
-index 8670f53f406ec4fbc41f7e35667fa0f73f6037cb..1d6563721a05e6c43cb280abffd8ae6830e80223 100644
+index 8670f53f406ec4fbc41f7e35667fa0f73f6037cb..5547f4533046725932967cba9eb6519cb6d2e7c9 100644
 --- a/chrome/app/BUILD.gn
 +++ b/chrome/app/BUILD.gn
 @@ -259,7 +259,7 @@ grit("google_chrome_strings") {

patches/content-browser-storage_partition_impl.cc.patch

@@ -1,16 +1,16 @@
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
-index 66696708ac5efb20916aa64591949c2c20ee81c7..f214b9015c8449fccce4a45dcead370e3118a72e 100644
+index 795cf2df39f90a59b0fc9352ef2701166749fe49..d5b5a252a9d1be779fbca49c3f6b31a9a7e27d4e 100644
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -968,6 +968,7 @@ void StoragePartitionImpl::OnCanSendReportingReports(
+@@ -969,6 +969,7 @@ void StoragePartitionImpl::OnCanSendReportingReports(
      bool allowed = permission_controller->GetPermissionStatus(
                         PermissionType::BACKGROUND_SYNC, origin_url,
                         origin_url) == blink::mojom::PermissionStatus::GRANTED;
 +    allowed = false; // feature disabled in Brave
      if (allowed)
        origins_out.push_back(origin);
    }
-@@ -980,7 +981,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload(
+@@ -981,7 +982,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload(
      OnCanSendDomainReliabilityUploadCallback callback) {
    PermissionController* permission_controller =
        BrowserContext::GetPermissionController(browser_context_);