GN: fixes for the official build.

build/config/BUILD.gn

 # Copyright (c) 2013 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/allocator.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
@@ skipping 23 matching lines @@
 }
 
 # TODO(brettw) Most of these should be removed. Instead of global feature
 # flags, we should have more modular flags that apply only to a target and its
 # dependents. For example, depending on the "x11" meta-target should define
 # USE_X11 for all dependents so that everything that could use X11 gets the
 # define, but anything that doesn't depend on X11 doesn't see it.
 #
 # For now we define these globally to match the current GYP build.
 config("feature_flags") {
-  # TODO(brettw) most of these need to be parameterized.
+  # TODO(brettw) this probably needs to be parameterized.
   defines = [
-    "CHROMIUM_BUILD",
     "V8_DEPRECATION_WARNINGS",  # Don't use deprecated V8 APIs anywhere.
   ]
 
   if (cld_version > 0) {
     defines += [ "CLD_VERSION=$cld_version" ]
   }
   if (enable_mdns) {
     defines += [ "ENABLE_MDNS=1" ]
   }
   if (enable_notifications) {
@@ skipping 175 matching lines @@
   }
   if (safe_browsing_mode == 1) {
     defines += [ "FULL_SAFE_BROWSING" ]
     defines += [ "SAFE_BROWSING_CSD" ]
     defines += [ "SAFE_BROWSING_DB_LOCAL" ]
     defines += [ "SAFE_BROWSING_SERVICE" ]
   } else if (safe_browsing_mode == 2) {
     defines += [ "MOBILE_SAFE_BROWSING" ]
     defines += [ "SAFE_BROWSING_SERVICE" ]
   }
+  if (is_official_build) {
+    defines += [ "OFFICIAL_BUILD" ]
+  }
+  if (is_chrome_branded) {
+    defines += [ "GOOGLE_CHROME_BUILD" ]
+  } else {
+    defines += [ "CHROMIUM_BUILD" ]
+  }
 }
 
 # Debug/release ----------------------------------------------------------------
 
 config("debug") {
   defines = [
     "_DEBUG",
     "DYNAMIC_ANNOTATIONS_ENABLED=1",
     "WTF_USE_DYNAMIC_ANNOTATIONS=1",
   ]
@@ skipping 87 matching lines @@
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreText.framework",
       "Foundation.framework",
       "UIKit.framework",
     ]
   } else if (is_linux) {
     libs = [ "dl" ]
   }
 }