Use new branding.gni file strings to set macOS chrome/updater target names.

Bug: 1047214
Change-Id: Ie9bf8d7130debcbafcbdd9df2bbe40a5be28ec83
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033924
Commit-Queue: Michael Chang <donchan@microsoft.com>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741554}

chrome/tools/build/mac/FILES.cfg

@@ -131,7 +131,7 @@ FILES = [
   },
   # Updater files:
   {
-    'filename': 'GoogleUpdate.app',
+    'filename': 'GoogleUpdater.app',
     'buildtype': ['official'],
     'archive': 'updater.zip',
   },

chrome/updater/BRANDING

-COMPANY_FULLNAME=Google LLC
-COMPANY_SHORTNAME=Google
-PRODUCT_FULLNAME=GoogleUpdater
-COPYRIGHT=Copyright 2019 The Chromium Authors. All rights reserved.

chrome/updater/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/util/process_version.gni")
+import("//chrome/updater/branding.gni")
 import("//testing/test.gni")
 
 # TODO(sorin): make the code build on Linux. https://crbug.com/1014320
@@ -72,10 +73,21 @@ if (is_win || is_mac) {
   }
 
   process_version("version_header") {
-    sources = [
-      "//chrome/VERSION",
-      "BRANDING",
+    sources = [ "//chrome/VERSION" ]
+
+    extra_args = [
+      "-e",
+      "COMPANY_FULLNAME=\"$updater_company_full_name\"",
+      "-e",
+      "COMPANY_SHORTNAME=\"$updater_company_short_name\"",
+      "-e",
+      "PRODUCT_FULLNAME=\"$updater_product_full_name\"",
+      "-e",
+      "COPYRIGHT=\"updater_copyright\"",
+      "-e",
+      "MAC_BUNDLE_IDENTIFIER=\"$mac_updater_bundle_identifier\"",
     ]
+
     template_file = "updater_version.h.in"
     output = "$target_gen_dir/updater_version.h"
   }

chrome/updater/branding.gni

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+
+if (is_chrome_branded) {
+  updater_company_full_name = "Google LLC"
+  updater_company_short_name = "Google"
+  updater_product_full_name = "GoogleUpdater"
+  updater_copyright =
+      "Copyright 2020 The Chromium Authors. All rights reserved."
+  mac_updater_bundle_identifier = "com.google.GoogleUpdater"
+} else {
+  updater_company_full_name = "Chromium Authors"
+  updater_company_short_name = "Chromium"
+  updater_product_full_name = "ChromiumUpdater"
+  updater_copyright =
+      "Copyright 2020 The Chromium Authors. All rights reserved."
+  mac_updater_bundle_identifier = "org.chromium.ChromiumUpdater"
+}

chrome/updater/mac/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/mac/rules.gni")
+import("//chrome/updater/branding.gni")
 
 group("mac") {
   deps = [
@@ -43,7 +44,7 @@ source_set("updater_tests") {
 
 mac_app_bundle("updater_bundle") {
   info_plist = "Info.plist"
-  output_name = "GoogleUpdate"
+  output_name = updater_product_full_name
 
   sources = [ "main.cc" ]
   deps = [

chrome/updater/mac/setup/setup.mm

@@ -31,9 +31,16 @@ namespace updater {
 namespace setup {
 
 namespace {
-
-constexpr base::FilePath::CharType kUpdaterFolder[] =
-    FILE_PATH_LITERAL("Google/GoogleUpdate/");
+const base::FilePath GetUpdateFolderName() {
+  return base::FilePath(COMPANY_SHORTNAME_STRING)
+      .AppendASCII(PRODUCT_FULLNAME_STRING);
+}
+const base::FilePath GetUpdaterAppName() {
+  return base::FilePath(PRODUCT_FULLNAME_STRING ".app");
+}
+const base::FilePath GetUpdaterAppExecutablePath() {
+  return base::FilePath("Contents/MacOS").AppendASCII(PRODUCT_FULLNAME_STRING);
+}
 
 void ThreadPoolStart() {
   base::ThreadPoolInstance::CreateAndStartWithDefaultParams("UpdaterSetup");
@@ -83,12 +90,12 @@ void TerminateUpdaterSetupMain() {
 bool CopyBundle() {
   // Copy bundle to "~/Library/Google/GoogleUpdate".
   const base::FilePath dest_path =
-      base::mac::GetUserLibraryPath().Append(kUpdaterFolder);
+      base::mac::GetUserLibraryPath().Append(GetUpdateFolderName());
 
   base::FilePath this_executable_path;
   base::PathService::Get(base::FILE_EXE, &this_executable_path);
-  const base::FilePath src_path = this_executable_path.DirName().Append(
-      FILE_PATH_LITERAL("GoogleUpdate.app"));
+  const base::FilePath src_path =
+      this_executable_path.DirName().Append(GetUpdaterAppName());
 
   if (!base::CopyDirectory(src_path, dest_path, true)) {
     LOG(ERROR) << "Copying app to ~/Library failed";
@@ -100,7 +107,7 @@ bool CopyBundle() {
 bool DeleteInstallFolder() {
   // Delete the install folder - "~/Library/Google/GoogleUpdate".
   const base::FilePath dest_path =
-      base::mac::GetUserLibraryPath().Append(kUpdaterFolder);
+      base::mac::GetUserLibraryPath().Append(GetUpdateFolderName());
 
   if (!base::DeleteFileRecursively(dest_path)) {
     LOG(ERROR) << "Deleting " << dest_path << " failed";
@@ -110,8 +117,10 @@ bool DeleteInstallFolder() {
 }
 
 base::ScopedCFTypeRef<CFStringRef> CopyGoogleUpdateCheckLaunchDName() {
-  return base::ScopedCFTypeRef<CFStringRef>(CFStringCreateCopy(
-      kCFAllocatorDefault, CFSTR("com.google.GoogleUpdate.check")));
+  std::string launchd_name = MAC_BUNDLE_IDENTIFIER_STRING;
+  launchd_name.append(".check");
+  return base::ScopedCFTypeRef<CFStringRef>(
+      base::SysUTF8ToCFStringRef(launchd_name), base::scoped_policy::RETAIN);
 }
 
 base::scoped_nsobject<NSString> GetGoogleUpdateCheckLaunchDLabel() {
@@ -125,12 +134,11 @@ base::scoped_nsobject<NSString> GetGoogleUpdateCheckMachName() {
       base::mac::CFToNSCast(CopyGoogleUpdateCheckLaunchDName()));
   return base::scoped_nsobject<NSString>(
       [name stringByAppendingFormat:@".%lu",
-                                    [GetGoogleUpdateCheckLaunchDLabel() hash]],
-      base::scoped_policy::RETAIN);
+                                    [GetGoogleUpdateCheckLaunchDLabel() hash]]);
 }
 
 base::ScopedCFTypeRef<CFDictionaryRef> CreateGoogleUpdateCheckLaunchdPlist(
-    base::FilePath* updater_path) {
+    const base::FilePath* updater_path) {
   // See the man page for launchd.plist.
   NSDictionary* launchd_plist = @{
     @LAUNCH_JOBKEY_LABEL : GetGoogleUpdateCheckLaunchDLabel(),
@@ -154,11 +162,11 @@ bool CreateLaunchdItems() {
                                                 base::BlockingType::MAY_BLOCK);
   base::ScopedCFTypeRef<CFStringRef> name(CopyGoogleUpdateCheckLaunchDName());
 
-  base::FilePath updater_path =
+  const base::FilePath updater_path =
       base::mac::GetUserLibraryPath()
-          .Append(kUpdaterFolder)
-          .Append(FILE_PATH_LITERAL("GoogleUpdate.app"))
-          .Append(FILE_PATH_LITERAL("Contents/MacOS/GoogleUpdate"));
+          .Append(GetUpdateFolderName())
+          .Append(GetUpdaterAppName())
+          .Append(GetUpdaterAppExecutablePath());
 
   base::ScopedCFTypeRef<CFDictionaryRef> plist(
       CreateGoogleUpdateCheckLaunchdPlist(&updater_path));

chrome/updater/updater_unittest.cc

@@ -9,12 +9,13 @@
 #include "base/process/process.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "chrome/updater/updater_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #define EXECUTABLE_EXTENSION ".exe"
 #else
-#define EXECUTABLE_EXTENSION ""
+#define EXECUTABLE_EXTENSION ".app"
 #endif
 
 // Tests the updater process returns 0 when run with --test argument.
@@ -28,10 +29,11 @@ TEST(UpdaterTest, UpdaterExitCode) {
           FILE_PATH_LITERAL("updater" EXECUTABLE_EXTENSION));
 #elif defined(OS_MACOSX)
       this_executable_path.DirName()
-          .Append(FILE_PATH_LITERAL("GoogleUpdate.app"))
+          .Append(
+              FILE_PATH_LITERAL(PRODUCT_FULLNAME_STRING EXECUTABLE_EXTENSION))
           .Append(FILE_PATH_LITERAL("Contents"))
           .Append(FILE_PATH_LITERAL("MacOS"))
-          .Append(FILE_PATH_LITERAL("GoogleUpdate"));
+          .Append(FILE_PATH_LITERAL(PRODUCT_FULLNAME_STRING));
 #else
       "";
 #endif

chrome/updater/updater_version.h.in

@@ -12,3 +12,4 @@
 #define COMPANY_SHORTNAME_STRING "@COMPANY_SHORTNAME@"
 #define PRODUCT_FULLNAME_STRING "@PRODUCT_FULLNAME@"
 #define OFFICIAL_BUILD_STRING "@OFFICIAL_BUILD@"
+#define MAC_BUNDLE_IDENTIFIER_STRING "@MAC_BUNDLE_IDENTIFIER@"

tools/mb/mb.py

@@ -1298,8 +1298,8 @@ class MetaBuildWrapper(object):
       # these will lead to incorrect incremental builds if their directory
       # contents change. Do not add to this list.
       # TODO(https://crbug.com/912946): Remove this if statement.
-      if ((is_msan and f == 'instrumented_libraries_prebuilt/') or
-          f == 'mr_extension/' or # https://crbug.com/997947
+      if ((is_msan and f == 'instrumented_libraries_prebuilt/')
+          or f == 'mr_extension/' or  # https://crbug.com/997947
           f.startswith('nacl_test_data/') or
           f.startswith('ppapi_nacl_tests_libs/') or
           (is_cros and f in (  # https://crbug.com/1002509
@@ -1310,17 +1310,17 @@ class MetaBuildWrapper(object):
               'resources/chromeos/accessibility/chromevox/',
               'resources/chromeos/accessibility/select_to_speak/',
               'test_data/chrome/browser/resources/chromeos/accessibility/'
-                  'autoclick/',
+              'autoclick/',
               'test_data/chrome/browser/resources/chromeos/accessibility/'
-                  'chromevox/',
+              'chromevox/',
               'test_data/chrome/browser/resources/chromeos/accessibility/'
-                  'select_to_speak/',
-          )) or
-          (is_mac and f in (  # https://crbug.com/1000667
+              'select_to_speak/',
+          )) or (is_mac and f in (  # https://crbug.com/1000667
               'AlertNotificationService.xpc/',
               'Chromium Framework.framework/',
               'Chromium Helper.app/',
               'Chromium.app/',
+              'ChromiumUpdater.app/',
               'Content Shell.app/',
               'Google Chrome Framework.framework/',
               'Google Chrome Helper (GPU).app/',
@@ -1328,7 +1328,7 @@ class MetaBuildWrapper(object):
               'Google Chrome Helper (Renderer).app/',
               'Google Chrome Helper.app/',
               'Google Chrome.app/',
-              'GoogleUpdate.app/',
+              'GoogleUpdater.app/',
               'blink_deprecated_test_plugin.plugin/',
               'blink_test_plugin.plugin/',
               'corb_test_plugin.plugin/',