More GOOGLE_CHROME_BUILD -> GOOGLE_CHROME_BRANDING.

Mostly boring, but remove GOOGLE_CHROME_BUILD from two .h files again so that
no public_deps on //build:branding_buildflags are needed.

Bug: 961769
Change-Id: Iff4db52b895c9a0ab5fbc6c299956c28ef966b38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841977
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703324}

chrome/browser/chromeos/BUILD.gn

@@ -59,6 +59,7 @@ source_set("chromeos") {
     "//ash",
     "//ash/public/cpp",
     "//ash/system/message_center/arc",
+    "//build:branding_buildflags",
     "//chrome/app:command_ids",
     "//chrome/app/vector_icons",
     "//chrome/browser/apps/platform_apps",

chrome/browser/defaults.cc

@@ -29,13 +29,11 @@ const bool kAlwaysOpenIncognitoWindow = false;
 const bool kAlwaysCreateTabbedBrowserOnSessionRestore = true;
 #endif
 
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #if defined(OS_CHROMEOS)
 const bool kShowHelpMenuItemIcon = true;
 #else
 const bool kShowHelpMenuItemIcon = false;
 #endif
-#endif
 
 const bool kDownloadPageHasShowInFolder = true;
 

chrome/browser/defaults.h

@@ -17,9 +17,9 @@ extern const bool kBrowserAliveWithNoWindows;
 // Whether various menu items are shown.
 extern const bool kShowExitMenuItem;
 extern const bool kShowUpgradeMenuItem;
-#if defined(GOOGLE_CHROME_BUILD)
+
+// Only used in branded builds.
 extern const bool kShowHelpMenuItemIcon;
-#endif
 
 // Should a link be shown on the bookmark bar allowing the user to import
 // bookmarks?

chrome/browser/ui/BUILD.gn

@@ -383,6 +383,7 @@ jumbo_split_static_library("ui") {
     "//base",
     "//base:i18n",
     "//base/allocator:buildflags",
+    "//build:branding_buildflags",
     "//cc/paint",
     "//chrome:extra_resources",
     "//chrome:resources",
@@ -1357,7 +1358,6 @@ jumbo_split_static_library("ui") {
     ]
     deps += [
       "//base/util/values:values_util",
-      "//build:branding_buildflags",
       "//chrome/app/vector_icons",
       "//chrome/browser:theme_properties",
       "//chrome/browser/media/router",
@@ -1912,7 +1912,6 @@ jumbo_split_static_library("ui") {
       "//ash/public/cpp",
       "//ash/public/cpp/resources:ash_public_unscaled_resources",
       "//ash/public/cpp/vector_icons",
-      "//build:branding_buildflags",
       "//chrome/browser/chromeos",
       "//chrome/browser/chromeos:backdrop_wallpaper_proto",
       "//chrome/browser/resources/chromeos:camera_resources",
@@ -3236,7 +3235,6 @@ jumbo_split_static_library("ui") {
       "webauthn/transport_utils.h",
     ]
     deps += [
-      "//build:branding_buildflags",
       "//chrome/browser/ui/views",
       "//components/constrained_window",
       "//components/media_message_center",

chrome/browser/ui/libgtkui/BUILD.gn

@@ -66,6 +66,7 @@ jumbo_component("libgtkui") {
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
+    "//build:branding_buildflags",
     "//build/config/linux/gtk",
     "//build/config/linux/gtk:gtkprint",
     "//cc/paint",

chrome/common/BUILD.gn

@@ -62,10 +62,14 @@ source_set("channel_info") {
     "channel_info_mac.mm",
     "channel_info_win.cc",
   ]
-
   if (is_posix && !is_android && !is_chromeos && !is_mac) {
     sources += [ "channel_info_posix.cc" ]
   }
+
+  deps = [
+    "//build:branding_buildflags",
+  ]
+
   public_deps = [
     "//base",
     "//components/version_info",
@@ -614,7 +618,6 @@ static_library("constants") {
     ":buildflags",
     ":chrome_features",
     ":non_code_constants",
-    "//build:branding_buildflags",
     "//content/public/common:result_codes",
     "//rlz/buildflags",
   ]
@@ -624,6 +627,7 @@ static_library("constants") {
     ":version_header",
     "//base",
     "//base/third_party/dynamic_annotations",
+    "//build:branding_buildflags",
     "//components/bookmarks/common",
     "//components/nacl/common:switches",
     "//components/offline_pages/buildflags",

chrome/common/channel_info_chromeos.cc

@@ -5,6 +5,7 @@
 #include "chrome/common/channel_info.h"
 
 #include "base/system/sys_info.h"
+#include "build/branding_buildflags.h"
 #include "components/version_info/version_info.h"
 
 namespace chrome {
@@ -31,7 +32,7 @@ void SetChannel(const std::string& channel) {
 }  // namespace
 
 std::string GetChannelName() {
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   switch (g_chromeos_channel) {
     case version_info::Channel::STABLE:
       return std::string();
@@ -53,7 +54,7 @@ version_info::Channel GetChannel() {
   if (is_channel_set)
     return g_chromeos_channel;
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   static const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK";
   std::string channel;
   if (base::SysInfo::GetLsbReleaseValue(kChromeOSReleaseTrack, &channel)) {

chrome/common/channel_info_mac.mm

@@ -8,12 +8,13 @@
 
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
+#include "build/branding_buildflags.h"
 #include "components/version_info/version_info.h"
 
 namespace chrome {
 
 std::string GetChannelName() {
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   // Use the main Chrome application bundle and not the framework bundle.
   // Keystone keys don't live in the framework.
   NSBundle* bundle = base::mac::OuterBundle();
@@ -42,7 +43,7 @@ std::string GetChannelName() {
 }
 
 version_info::Channel GetChannelByName(const std::string& channel) {
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   if (channel.empty())
     return version_info::Channel::STABLE;
   if (channel == "beta")

chrome/common/channel_info_posix.cc

@@ -5,6 +5,7 @@
 #include "chrome/common/channel_info.h"
 
 #include "base/strings/string_util.h"
+#include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "components/version_info/version_info.h"
 
@@ -25,7 +26,7 @@ version_info::Channel GetChannelImpl(std::string* modifier_out,
   if (env)
     modifier = env;
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   // Only ever return "", "unknown", "dev" or "beta" in a branded build.
   if (modifier == "unstable")  // linux version of "dev"
     modifier = "dev";

chrome/common/channel_info_win.cc

@@ -7,12 +7,13 @@
 #include "base/debug/profiler.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/branding_buildflags.h"
 #include "chrome/install_static/install_util.h"
 
 namespace chrome {
 
 std::string GetChannelName() {
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   base::string16 channel(install_static::GetChromeChannelName());
 #if defined(DCHECK_IS_CONFIGURABLE)
   // Adorn the channel when DCHECKs are baked into the build, as there will be

chrome/common/chrome_paths_mac.mm

@@ -13,6 +13,7 @@
 #import "base/mac/foundation_util.h"
 #include "base/memory/free_deleter.h"
 #include "base/path_service.h"
+#include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
@@ -56,7 +57,7 @@ char* ProductDirNameForBundle(NSBundle* chrome_bundle) {
     product_dir_name = [product_dir_name_ns fileSystemRepresentation];
 
     if (!product_dir_name) {
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
       product_dir_name = "Google/Chrome";
 #else
       product_dir_name = "Chromium";

chrome/common/pref_names.cc

@@ -1469,12 +1469,12 @@ const char kShowFirstRunDefaultSearchShortcut[] =
     "profile.show_first_run_default_search_shortcut";
 #endif
 
-#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#if defined(OS_WIN)
 // Put the user into an onboarding group that's decided when they go through
 // the first run onboarding experience. Only users in a group will have their
 // finch group pinged to keep track of them for the experiment.
 const char kNaviOnboardGroup[] = "browser.navi_onboard_group";
-#endif  // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#endif  // defined(OS_WIN)
 
 // *************** LOCAL STATE ***************
 // These are attached to the machine/installation
@@ -2588,7 +2588,6 @@ const char kDSEWasDisabledByPolicy[] = "dse_was_disabled_by_policy";
 const char kWebShareVisitedTargets[] = "profile.web_share.visited_targets";
 
 #if defined(OS_WIN)
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 // Acts as a cache to remember incompatible applications through restarts. Used
 // for the Incompatible Applications Warning feature.
 const char kIncompatibleApplications[] = "incompatible_applications";
@@ -2601,7 +2600,6 @@ const char kModuleBlacklistCacheMD5Digest[] =
 // A boolean value, controlling whether third party software is allowed to
 // inject into Chrome's processes.
 const char kThirdPartyBlockingEnabled[] = "third_party_blocking_enabled";
-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN)

chrome/common/pref_names.h

@@ -478,9 +478,10 @@ extern const char kHasSeenWelcomePage[];
 extern const char kShowFirstRunDefaultSearchShortcut[];
 #endif
 
-#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#if defined(OS_WIN)
+// Only used in branded builds.
 extern const char kNaviOnboardGroup[];
-#endif  // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#endif  // defined(OS_WIN)
 
 // Deprecated preference for metric / crash reporting on Android. Use
 // kMetricsReportingEnabled instead.
@@ -896,11 +897,10 @@ extern const char kDSEWasDisabledByPolicy[];
 extern const char kWebShareVisitedTargets[];
 
 #if defined(OS_WIN)
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+// Only used in branded builds.
 extern const char kIncompatibleApplications[];
 extern const char kModuleBlacklistCacheMD5Digest[];
 extern const char kThirdPartyBlockingEnabled[];
-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #endif  // defined(OS_WIN)
 
 // Windows mitigation policies.