Merge pull request #2976 from brave/76.0.3809.72

Upgrade patches from Chromium 76.0.3809.62 to Chromium 76.0.3809.72

app/mac/BUILD.gn

@@ -54,7 +54,7 @@ action("generate_breakpad_symbols") {
   deps = [
     "//brave:chrome_app",
     "//chrome:chrome_framework",
-    "//chrome:chrome_helper_app",
+    "//chrome:chrome_helper_app_default",
     "//chrome:chrome_dump_syms",
     "//third_party/crashpad/crashpad/handler:crashpad_handler",
     "//third_party/breakpad:dump_syms",

build/mac/sign_app.sh

@@ -11,10 +11,12 @@ SOURCE_DIR="${1}"
 DEST_DIR="${2}"
 PKG_DIR="${3}"
 DEVELOPMENT=
+MAC_PROVISIONING_PROFILE=
 if [[ "${4}" = "True" ]]; then
-  DEVELOPMENT="--development"
+    DEVELOPMENT="--development"
+else
+    MAC_PROVISIONING_PROFILE="${5}"
 fi
-MAC_PROVISIONING_PROFILE="${5}"
 MAC_SIGNING_KEYCHAIN="${6}"
 MAC_SIGNING_IDENTIFIER="${7}"
 
@@ -36,16 +38,23 @@ function check_exit() {
 
 trap check_exit EXIT
 
-# Copy signing script to the packaging directory
-SCRIPT_DIR=$(dirname ${0})
-cp -f "${SCRIPT_DIR}/sign_brave.py" "${PKG_DIR}"
+# brave/scripts/signing_helper.py will retrieve this value when called from
+# sign_chrome.py
+export MAC_PROVISIONING_PROFILE
+
+# Clear output directory. It seems GN auto-creates directory path to the
+# expected outputs. However, the signing script doesn't expect the path to
+# have been created and fails trying to create it again.
+echo "Cleaning $DEST_DIR ..."
+rm -rf $DEST_DIR/*
 
 # Invoke python script to do the signing.
+PARAMS="--input $SOURCE_DIR --output $DEST_DIR --keychain $MAC_SIGNING_KEYCHAIN --identity $MAC_SIGNING_IDENTIFIER --no-dmg --no-notarize"
 if [[ -z "${DEVELOPMENT}" ]]; then
   # Copy mac_provisioning_profile to the packaging_dir since that's where the
   # signing scripts expects to find it.
   cp -f "$MAC_PROVISIONING_PROFILE" "$PKG_DIR"
-  "${PKG_DIR}/sign_brave.py" --input "$SOURCE_DIR" --output "$DEST_DIR" --keychain "$MAC_SIGNING_KEYCHAIN" --identity "$MAC_SIGNING_IDENTIFIER" --no-dmg --provisioning-profile "$MAC_PROVISIONING_PROFILE"
 else
-  "${PKG_DIR}/sign_brave.py" --input "$SOURCE_DIR" --output "$DEST_DIR" --keychain "$MAC_SIGNING_KEYCHAIN" --identity "$MAC_SIGNING_IDENTIFIER" --no-dmg "$DEVELOPMENT"
+  PARAMS="$PARAMS $DEVELOPMENT"
 fi
+"${PKG_DIR}/sign_chrome.py" $PARAMS

patches/chrome-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b8c4a1956 100644
+index 39a8e6fded4b9f9c3c8b5c0bb9f50e919a577545..6708b39ed56ab8dc2cf593b5a79abe17b12ed2a2 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -189,6 +189,10 @@ if (!is_android && !is_mac) {
+@@ -190,6 +190,10 @@ if (!is_android && !is_mac) {
            "common/crash_keys.cc",
            "common/crash_keys.h",
          ]
@@ -13,31 +13,31 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b
 
          deps += [
            ":chrome_dll",
-@@ -288,6 +292,7 @@ if (!is_android && !is_mac) {
+@@ -289,6 +293,7 @@ if (!is_android && !is_mac) {
            "//headless:headless_shell_lib",
            "//services/service_manager/embedder",
          ]
 +        deps += [ "//components/unified_consent" ]
 
          public_deps = [
            ":xdg_mime",  # Needs to be public for installer to consume files.
-@@ -434,6 +439,7 @@ if (is_win) {
+@@ -435,6 +440,7 @@ if (is_win) {
        "//third_party/wtl",
        "//ui/views",
      ]
 +    deps += [ "//components/unified_consent" ]
 
      ldflags = [
        "/DELAYLOAD:advapi32.dll",
-@@ -568,6 +574,7 @@ if (is_win) {
+@@ -569,6 +575,7 @@ if (is_win) {
          "//headless:headless_shell_child_lib",
          "//services/service_manager/embedder",
        ]
 +      deps += [ "//components/unified_consent" ]
 
        ldflags = [
          "/DELAYLOAD:comctl32.dll",
-@@ -680,6 +687,11 @@ if (is_win) {
+@@ -681,6 +688,11 @@ if (is_win) {
      ]
    }
 
@@ -49,15 +49,15 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b
    mac_app_bundle("chrome_app") {
      output_name = chrome_product_full_name
 
-@@ -713,6 +725,7 @@ if (is_win) {
+@@ -714,6 +726,7 @@ if (is_win) {
                    rebase_path("app/app.exports", root_build_dir) ]
      }
    }
 +}
 
    compiled_action("chrome_app_strings") {
      tool = "//chrome/tools/build/mac:infoplist_strings_tool"
-@@ -742,7 +755,7 @@ if (is_win) {
+@@ -743,7 +756,7 @@ if (is_win) {
      args =
          [
            "-b",
@@ -66,7 +66,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b
            "-v",
            rebase_path(chrome_version_file, root_build_dir),
            "-g",
-@@ -823,7 +836,7 @@ if (is_win) {
+@@ -824,7 +837,7 @@ if (is_win) {
        # framework itself, that would cause a cyclical dependency. Instead,
        # this dependency directly copies the file into the framework's
        # resources directory.
@@ -75,15 +75,15 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b
      }
    }
 
-@@ -1222,6 +1235,7 @@ if (is_win) {
+@@ -1250,6 +1263,7 @@ if (is_win) {
        "//services/service_manager/embedder",
        "//third_party/cld_3/src/src:cld_3",
      ]
 +    deps += [ "//components/unified_consent" ]
 
      if (is_component_build) {
        libs = [ "Carbon.framework" ]
-@@ -1286,6 +1300,10 @@ if (is_win) {
+@@ -1314,6 +1328,10 @@ if (is_win) {
      if (is_chrome_branded) {
        deps += [ ":default_apps" ]
      }
@@ -94,15 +94,15 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b
 
      ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ]
 
-@@ -1446,6 +1464,7 @@ if (is_win) {
+@@ -1484,6 +1502,7 @@ if (is_win) {
 
  group("browser_dependencies") {
    public_deps = [
 +    "//brave:browser_dependencies",
      "//chrome/browser",
      "//chrome/common",
      "//components/gwp_asan/buildflags",
-@@ -1519,13 +1538,14 @@ group("child_dependencies") {
+@@ -1557,13 +1576,14 @@ group("child_dependencies") {
        # this is OK because all of content is linked into one library.
        "//content/browser",
      ]
@@ -118,15 +118,15 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..c77b47711636c6cf5ab6abdea21abf1b
      ]
      output = "$target_gen_dir/chrome_exe_version.rc"
    }
-@@ -1598,6 +1618,7 @@ group("resources") {
+@@ -1636,6 +1656,7 @@ group("resources") {
      "//chrome/browser:resources",
      "//chrome/common:resources",
      "//chrome/renderer:resources",
 +    "//brave:resources",
    ]
  }
 
-@@ -1849,6 +1870,7 @@ if (is_android) {
+@@ -1887,6 +1908,7 @@ if (is_android) {
        "//content/public/common:service_names",
        "//services/service_manager/embedder",
      ]

patches/chrome-VERSION.patch

@@ -1,11 +1,11 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index e05d1f3aaf621bae4c2448a8dd9ee80a90b2321b..6f14cd915f02f2a05d0d78ad5fba93f7ae33267d 100644
+index 556db09bacc7ecdd8fefe44172fcd20866c2c7fc..4caee6d1e089996ef39511610a955ee6f387e5c8 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=76
  MINOR=0
 -BUILD=3809
--PATCH=62
+-PATCH=72
 +BUILD=70
 +PATCH=8

patches/chrome-browser-permissions-permission_request.h.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/permissions/permission_request.h b/chrome/browser/permissions/permission_request.h
-index 6daa247ce558241db33a1d1ae0187f14631cc842..dcbfa42bd87013619a7a54a2597487e479338ce3 100644
+index 6daa247ce558241db33a1d1ae0187f14631cc842..1bd4ae483d9803262a61fc7e6196848aa814ec54 100644
 --- a/chrome/browser/permissions/permission_request.h
 +++ b/chrome/browser/permissions/permission_request.h
 @@ -45,6 +45,7 @@ enum class PermissionRequestType {

patches/chrome-browser-profiles-profile.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 71d736c9eaf3503e532d72c410f4d4dadff372cd..f278991246e40b894418cd05f9a5fb6fb192c5a5 100644
+index 71d736c9eaf3503e532d72c410f4d4dadff372cd..39114245329d5767f8b51a5c9120c76038018d04 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
 @@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";

patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
-index 4fab5d0fd6bc6b6c47f4174dc1f611ba79610589..ba50e1396991f7f852c2007dbb9543f9b4b83990 100644
+index 4fab5d0fd6bc6b6c47f4174dc1f611ba79610589..33ed86ccfadb68cbb2b0b6f321b59de995a2002c 100644
 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
 +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
 @@ -443,7 +443,7 @@ void LocationBarView::OnKeywordFaviconFetched(const gfx::Image& icon) {

patches/chrome-common-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
-index 81c957087e6adbfe78208035cf52052c93a1e978..445736d844a330a10c9c8da392fe6a10790a2ce0 100644
+index 15dcd3acac69be8ec9ec5f8f2eb9e0f6b68c88fd..944f5f34ebbf89bc5bec61e86cfcf962af1593ca 100644
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
 @@ -78,6 +78,7 @@ source_set("channel_info") {
@@ -10,15 +10,15 @@ index 81c957087e6adbfe78208035cf52052c93a1e978..445736d844a330a10c9c8da392fe6a10
  }
 
  source_set("ini_parser") {
-@@ -210,6 +211,7 @@ static_library("common") {
+@@ -208,6 +209,7 @@ static_library("common") {
    ]
 
    public_deps = [
 +    "//brave/common",
      ":available_offline_content_mojom",
      ":buildflags",
      ":channel_info",
-@@ -548,6 +550,7 @@ static_library("non_code_constants") {
+@@ -543,6 +545,7 @@ static_library("non_code_constants") {
      "//printing/buildflags",
      "//ui/base:buildflags",
    ]

patches/chrome-installer-mac-sign_chrome.py.patch

@@ -0,0 +1,29 @@
+diff --git a/chrome/installer/mac/sign_chrome.py b/chrome/installer/mac/sign_chrome.py
+index fa3a88200f5156975d0da5bcc52ed6f9896e792e..9068adc58127d24f50f47b3f1f939e2b6feaef69 100755
+--- a/chrome/installer/mac/sign_chrome.py
++++ b/chrome/installer/mac/sign_chrome.py
+@@ -28,6 +28,7 @@ def create_config(config_args, development):
+         An instance of |model.CodeSignConfig|.
+     """
+     config_class = config.CodeSignConfig
++    """
+     try:
+         import signing.internal_config
+         config_class = signing.internal_config.InternalCodeSignConfig
+@@ -36,6 +37,7 @@ def create_config(config_args, development):
+         # internal config has to be available.
+         if config_class(identity, keychain).product == 'Google Chrome':
+             raise e
++    """
+
+     if development:
+
+@@ -55,6 +57,8 @@ def create_config(config_args, development):
+
+         config_class = DevelopmentCodeSignConfig
+
++    from signing_helper import GetBraveSigningConfig
++    config_class = GetBraveSigningConfig(config_class, development)
+     return config_class(*config_args)
+
+