More GOOGLE_CHROME_BUILD -> GOOGLE_CHROME_BRANDING.

Changes some new uses, and does fairly harmless modifications
to keep GOOGLE_CHROME_BRANDING out of .h files.

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

chrome/browser/chromeos/login/test/oobe_screens_utils.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/login/test/oobe_screens_utils.h"
 
+#include "build/branding_buildflags.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/screens/sync_consent_screen.h"
@@ -123,10 +124,8 @@ void SkipToEnrollmentOnRecovery() {
   test::WaitForNetworkSelectionScreen();
   test::TapNetworkSelectionNext();
 
-#if defined(GOOGLE_CHROME_BUILD)
   WaitForEulaScreen();
   TapEulaAccept();
-#endif
 
   test::WaitForUpdateScreen();
   test::ExitUpdateScreenNoUpdate();
@@ -138,20 +137,26 @@ void WaitForEnrollmentScreen() {
   WaitFor(EnrollmentScreenView::kScreenId);
 }
 
-#if defined(GOOGLE_CHROME_BUILD)
 void WaitForEulaScreen() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   WaitFor(EulaView::kScreenId);
+#endif
 }
 
 void TapEulaAccept() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   test::OobeJS().TapOnPath({"oobe-eula-md", "acceptButton"});
+#endif
 }
 
 void WaitForSyncConsentScreen() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   WaitFor(SyncConsentScreenView::kScreenId);
+#endif
 }
 
 void ExitScreenSyncConsent() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   SyncConsentScreen* screen = static_cast<SyncConsentScreen*>(
       WizardController::default_controller()->GetScreen(
           SyncConsentScreenView::kScreenId));
@@ -159,8 +164,8 @@ void ExitScreenSyncConsent() {
   screen->SetProfileSyncDisabledByPolicyForTesting(true);
   screen->OnStateChanged(nullptr);
   WaitForExit(SyncConsentScreenView::kScreenId);
-}
 #endif
+}
 
 }  // namespace test
 }  // namespace chromeos

chrome/browser/chromeos/login/test/oobe_screens_utils.h

@@ -22,12 +22,10 @@ void ExitDiscoverPinSetupScreen();
 void SkipToEnrollmentOnRecovery();
 void WaitForEnrollmentScreen();
 
-#if defined(GOOGLE_CHROME_BUILD)
 void WaitForEulaScreen();
 void TapEulaAccept();
 void WaitForSyncConsentScreen();
 void ExitScreenSyncConsent();
-#endif
 
 }  // namespace test
 }  // namespace chromeos

chrome/browser/ui/views/profiles/profile_menu_view.cc

@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
+#include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
@@ -113,7 +114,7 @@ bool AreSigninCookiesClearedOnExit(Profile* profile) {
   return client->AreSigninCookiesDeletedOnExit();
 }
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 // Returns the Google G icon in grey and with a padding of 2. The padding is
 // needed to make the icon look smaller, otherwise it looks too big compared to
 // the other icons. See crbug.com/951751 for more information.
@@ -594,7 +595,7 @@ void ProfileMenuView::BuildFeatureButtons() {
 
   if (has_unconsented_account) {
     AddFeatureButton(
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
         // The Google G icon needs to be shrunk, so it won't look too big
         // compared to the other icons.
         ImageForMenu(kGoogleGLogoIcon, /*icon_to_image_ratio=*/0.75),
@@ -691,13 +692,11 @@ void ProfileMenuView::AddProfileMenuView(AvatarMenu* avatar_menu) {
       AddGuestProfileView();
   }
 
-#if defined(GOOGLE_CHROME_BUILD)
   if (dice_enabled_ && !dice_accounts_.empty() &&
       !SigninErrorControllerFactory::GetForProfile(browser()->profile())
            ->HasError()) {
     AddManageGoogleAccountButton();
   }
-#endif
 
   if (browser()->profile()->IsSupervised())
     AddSupervisedUserDisclaimerView();
@@ -1093,16 +1092,16 @@ void ProfileMenuView::AddAutofillHomeView() {
                           base::Unretained(this)));
 }
 
-#if defined(GOOGLE_CHROME_BUILD)
 void ProfileMenuView::AddManageGoogleAccountButton() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   AddMenuGroup(false);
   CreateAndAddButton(
       GetGoogleIconForUserMenu(GetDefaultIconSize()),
       l10n_util::GetStringUTF16(IDS_SETTINGS_MANAGE_GOOGLE_ACCOUNT),
       base::BindRepeating(&ProfileMenuView::OnManageGoogleAccountButtonClicked,
                           base::Unretained(this)));
-}
 #endif
+}
 
 void ProfileMenuView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {

chrome/browser/ui/views/profiles/profile_menu_view.h

@@ -99,9 +99,7 @@ class ProfileMenuView : public ProfileMenuViewBase, public AvatarMenuObserver {
   void AddOptionsView(bool display_lock, AvatarMenu* avatar_menu);
   void AddSupervisedUserDisclaimerView();
   void AddAutofillHomeView();
-#if defined(GOOGLE_CHROME_BUILD)
   void AddManageGoogleAccountButton();
-#endif
 
   // Adds the DICE UI view to sign in and turn on sync. It includes an
   // illustration, a promo and a button.

chrome/browser/ui/views/translate/translate_bubble_view.cc

@@ -15,6 +15,7 @@
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
@@ -81,7 +82,7 @@ class AdvancedViewContainer : public views::View {
 
 bool UseGoogleTranslateBranding() {
   // Only use Google Translate branding in Chrome branded builds.
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   return true;
 #else
   return false;

chrome/browser/upgrade_detector/upgrade_detector_impl.cc

@@ -195,7 +195,7 @@ UpgradeDetectorImpl::UpgradeDetectorImpl(const base::Clock* clock,
     // Also note that to test with a given time/date, until the network time
     // tracking moves off of the VariationsService, the "variations-server-url"
     // command line switch must also be specified for the service to be
-    // available on non GOOGLE_CHROME_BUILD.
+    // available on non GOOGLE_CHROME_BRANDING.
     std::string switch_name;
     if (cmd_line.HasSwitch(switches::kSimulateOutdatedNoAU)) {
       is_auto_update_enabled_ = false;
@@ -230,7 +230,7 @@ UpgradeDetectorImpl::UpgradeDetectorImpl(const base::Clock* clock,
 #if defined(OS_WIN)
 // Only enable upgrade notifications for Google Chrome builds. Chromium does not
 // use an auto-updater.
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   // There might be a policy/enterprise environment preventing updates, so
   // validate updatability and then call StartTimerForUpgradeCheck
   // appropriately. Skip this step if a past attempt has been made to enable
@@ -246,7 +246,7 @@ UpgradeDetectorImpl::UpgradeDetectorImpl(const base::Clock* clock,
         base::BindOnce(&UpgradeDetectorImpl::OnAutoupdatesEnabledResult,
                        weak_factory_.GetWeakPtr()));
   }
-#endif  // defined(GOOGLE_CHROME_BUILD)
+#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #else   // defined(OS_WIN)
 #if defined(OS_MACOSX)
   // Only enable upgrade notifications if the updater (Keystone) is present.
@@ -578,14 +578,14 @@ void UpgradeDetectorImpl::OnRelaunchNotificationPeriodPrefChanged() {
     NotifyOnUpgrade();
 }
 
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#if defined(OS_WIN)
 void UpgradeDetectorImpl::OnAutoupdatesEnabledResult(
     bool auto_updates_enabled) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   is_auto_update_enabled_ = auto_updates_enabled;
   StartTimerForUpgradeCheck();
 }
-#endif  // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#endif  // defined(OS_WIN)
 
 void UpgradeDetectorImpl::NotifyOnUpgrade() {
   const base::TimeDelta time_passed = clock()->Now() - upgrade_detected_time();

chrome/browser/upgrade_detector/upgrade_detector_impl.h

@@ -88,7 +88,7 @@ class UpgradeDetectorImpl : public UpgradeDetector,
   // UpgradeDetector:
   void OnRelaunchNotificationPeriodPrefChanged() override;
 
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#if defined(OS_WIN)
   // Receives the results of AreAutoupdatesEnabled and starts the upgrade check
   // timer.
   void OnAutoupdatesEnabledResult(bool auto_updates_enabled);