diff --git a/chromium_src/chrome/installer/util/util_constants.cc b/chromium_src/chrome/installer/util/util_constants.cc new file mode 100644 index 000000000000..a19efcfa405c --- /dev/null +++ b/chromium_src/chrome/installer/util/util_constants.cc @@ -0,0 +1,31 @@ +/* Copyright (c) 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "chrome/installer/util/util_constants.h" + +#define kGoogleUpdateIsMachineEnvVar kGoogleUpdateIsMachineEnvVar_ChromiumImpl +#define kChromeExe kChromeExe_Unused + +#include "../../../../../chrome/installer/util/util_constants.cc" + +#undef kGoogleUpdateIsMachineEnvVar +#undef kChromeExe + +namespace installer { + +namespace env_vars { + +#if defined(OFFICIAL_BUILD) +const char kGoogleUpdateIsMachineEnvVar[] = "BraveSoftwareUpdateIsMachine"; +#else +const char kGoogleUpdateIsMachineEnvVar[] = + kGoogleUpdateIsMachineEnvVar_ChromiumImpl; +#endif + +} // namespace env_vars + +const wchar_t kChromeExe[] = L"brave.exe"; + +} // namespace installer diff --git a/patches/chrome-installer-util-util_constants.cc.patch b/patches/chrome-installer-util-util_constants.cc.patch deleted file mode 100644 index 0b2ddc0be60d..000000000000 --- a/patches/chrome-installer-util-util_constants.cc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc -index 77b5f3f11edc90875a8ee6cbf53f6c0909223c73..8a017c2bb7510ff5c115f82c6013c42ab39702cc 100644 ---- a/chrome/installer/util/util_constants.cc -+++ b/chrome/installer/util/util_constants.cc -@@ -182,7 +182,13 @@ namespace env_vars { - // The presence of this environment variable with a value of 1 implies that - // setup.exe should run as a system installation regardless of what is on the - // command line. -+#if defined(OFFICIAL_BUILD) -+// Reflect brave branded-omaha variable name. -+// Company name(BraveSoftware) + Product name(Update). -+const char kGoogleUpdateIsMachineEnvVar[] = "BraveSoftwareUpdateIsMachine"; -+#else - const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine"; -+#endif - - } // namespace env_vars - -@@ -197,7 +203,10 @@ const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine"; - // Active Setup. - const wchar_t kActiveSetupExe[] = L"chrmstp.exe"; - const wchar_t kChromeDll[] = L"chrome.dll"; -+const wchar_t kChromeExe[] = L"brave.exe"; -+#if 0 - const wchar_t kChromeExe[] = L"chrome.exe"; -+#endif - const wchar_t kChromeNewExe[] = L"new_chrome.exe"; - const wchar_t kChromeOldExe[] = L"old_chrome.exe"; - const wchar_t kChromeProxyExe[] = L"chrome_proxy.exe";