Don't condition on the branding when choosing LTO and CFI.

BUG=678915

Review-Url: https://codereview.chromium.org/2621193003
Cr-Commit-Position: refs/heads/master@{#442969}

build/config/sanitizers/sanitizers.gni

@@ -55,7 +55,7 @@ declare_args() {
   #
   # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.
   is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" &&
-           is_chrome_branded && is_official_build && allow_posix_link_time_opt
+           is_official_build && allow_posix_link_time_opt
 
   # Enable checks for bad casts: derived cast and unrelated cast.
   # TODO(krasin): remove this, when we're ready to add these checks by default.

build/toolchain/toolchain.gni

@@ -13,9 +13,8 @@ declare_args() {
   # faster, but linking is up to 5-20x slower).
   # Note: use target_os == "linux" rather than is_linux so that it does not
   # apply to host_toolchain when target_os="android".
-  allow_posix_link_time_opt =
-      target_os == "linux" && !is_chromeos && target_cpu == "x64" &&
-      is_chrome_branded && is_official_build
+  allow_posix_link_time_opt = target_os == "linux" && !is_chromeos &&
+                              target_cpu == "x64" && is_official_build
 
   # Set to true to use lld, the LLVM linker. This flag may be used on Windows
   # with the shipped LLVM toolchain, or on Linux with a self-built top-of-tree

tools/clang/scripts/update.py

@@ -399,8 +399,7 @@ def UpdateClang(args):
 
   need_gold_plugin = 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or (
       sys.platform.startswith('linux') and
-      'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and
-      'branding=Chrome' in os.environ.get('GYP_DEFINES', ''))
+      'buildtype=Official' in os.environ.get('GYP_DEFINES', ''))
 
   if ReadStampFile() == PACKAGE_VERSION and not args.force_local_build:
     print 'Clang is already up to date.'