Finish removing GOOGLE_CHROME_BUILD from .rc files.

...now that this is easy to do after #705630.

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

chrome/app/BUILD.gn

@@ -49,7 +49,10 @@ source_set("chrome_dll_resources") {
 
   if (is_win) {
     sources += [ "chrome_dll.rc" ]
-    deps += [ "//printing/buildflags" ]
+    deps += [
+      "//build:branding_buildflags",
+      "//printing/buildflags",
+    ]
   }
 }
 

chrome/app/chrome_dll.rc

 // Microsoft Visual C++ generated resource script.
 //
+#include "build/branding_buildflags.h"
 #include "chrome_dll_resource.h"
 #include "chrome_command_ids.h"
 #include "printing/buildflags/buildflags.h"
@@ -162,7 +163,7 @@ END
 // the icon from the current module). We can perhaps work around this in the
 // future to get the icon from the .exe, which would save a copy.
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 IDR_MAINFRAME       ICON                        "theme\google_chrome\win\chrome.ico"
 IDR_SXS             ICON                        "theme\google_chrome\win\chrome_sxs.ico"
 IDR_X004_DEV        ICON                        "theme\google_chrome\win\chrome_dev.ico"

chrome/app/chrome_exe.rc

 // Microsoft Visual C++ generated resource script.
 //
+#include "build/branding_buildflags.h"
 #include "chrome_exe_resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -35,7 +36,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Note: chrome/installer/util/shell_util.cc depends on the order and number of
 // icons.  To avoid breaking existing shortcuts, add new icons at the end
 // (following the ordering described above).
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 IDR_MAINFRAME           ICON       "theme\\google_chrome\\win\\chrome.ico"
 // These three are no longer used, but remain as placeholders. (They cannot be
 // removed, or existing shortcuts to the later resources will break.)
@@ -54,7 +55,7 @@ IDR_MAINFRAME           ICON       "theme\\chromium\\win\\chromium.ico"
 // should be incremented when a new icon is added. The icon indices in
 // chrome_icon_resources_win.h should also be updated.
 
-#if defined(GOOGLE_CHROME_BUILD)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
 IDR_X001_APP_LIST       ICON       "theme\\google_chrome\\win\\app_list.ico"
 IDR_X002_APP_LIST_SXS   ICON       "theme\\google_chrome\\win\\app_list_sxs.ico"
 IDR_X003_INCOGNITO      ICON       "theme\\google_chrome\\win\\incognito.ico"