Update from https://crrev.com/333737

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 118 matching lines @@
   }
   if (use_ozone) {
     defines += [ "USE_OZONE=1" ]
   }
   if (use_x11) {
     defines += [ "USE_X11=1" ]
   }
   if (use_allocator != "tcmalloc") {
     defines += [ "NO_TCMALLOC" ]
   }
-  if (is_asan) {
+  if (is_asan || is_lsan || is_tsan || is_msan) {
     defines += [
-      "ADDRESS_SANITIZER",
       "MEMORY_TOOL_REPLACES_ALLOCATOR",
       "MEMORY_SANITIZER_INITIAL_SIZE",
     ]
   }
+  if (is_asan) {
+    defines += [ "ADDRESS_SANITIZER" ]
+  }
+  if (is_lsan) {
+    defines += [
+      "LEAK_SANITIZER",
+      "WTF_USE_LEAK_SANITIZER=1",
+    ]
+  }
+  if (is_tsan) {
+    defines += [
+      "THREAD_SANITIZER",
+      "DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1",
+      "WTF_USE_DYNAMIC_ANNOTATIONS_NOIMPL=1",
+    ]
+  }
+  if (is_msan) {
+    defines += [ "MEMORY_SANITIZER" ]
+  }
   if (enable_webrtc) {
     defines += [ "ENABLE_WEBRTC=1" ]
   }
   if (disable_ftp_support) {
     defines += [ "DISABLE_FTP_SUPPORT=1" ]
   }
   if (!enable_nacl) {
     defines += [ "DISABLE_NACL" ]
   }
   if (enable_extensions) {
@@ skipping 46 matching lines @@
   }
   if (enable_google_now) {
     defines += [ "ENABLE_GOOGLE_NOW=1" ]
   }
   if (enable_one_click_signin) {
     defines += [ "ENABLE_ONE_CLICK_SIGNIN" ]
   }
   if (enable_hidpi) {
     defines += [ "ENABLE_HIDPI=1" ]
   }
+  if (enable_topchrome_md) {
+    defines += [ "ENABLE_TOPCHRME_MD=1" ]
+  }
   if (proprietary_codecs) {
     defines += [ "USE_PROPRIETARY_CODECS" ]
   }
   if (enable_hangout_services_extension) {
     defines += [ "ENABLE_HANGOUT_SERVICES_EXTENSION=1" ]
   }
   if (v8_use_external_startup_data) {
     defines += [ "V8_USE_EXTERNAL_STARTUP_DATA" ]
   }
   if (enable_background) {
@@ skipping 19 matching lines @@
     defines += [ "SAFE_BROWSING_SERVICE" ]
   }
   if (is_official_build) {
     defines += [ "OFFICIAL_BUILD" ]
   }
   if (is_chrome_branded) {
     defines += [ "GOOGLE_CHROME_BUILD" ]
   } else {
     defines += [ "CHROMIUM_BUILD" ]
   }
+  if (enable_media_router) {
+    defines += [ "ENABLE_MEDIA_ROUTER=1" ]
+  }
 }
 
 # Debug/release ----------------------------------------------------------------
 
 config("debug") {
   defines = [
     "_DEBUG",
     "DYNAMIC_ANNOTATIONS_ENABLED=1",
     "WTF_USE_DYNAMIC_ANNOTATIONS=1",
   ]
@@ skipping 16 matching lines @@
     defines += [ "_GLIBCXX_DEBUG=1" ]
   }
 }
 
 config("release") {
   defines = [ "NDEBUG" ]
 
   # Sanitizers.
   # TODO(GYP) The GYP build has "release_valgrind_build == 0" for this
   # condition. When Valgrind is set up, we need to do the same here.
-  if (!is_tsan) {
+  if (is_tsan) {
+    defines += [
+      "DYNAMIC_ANNOTATIONS_ENABLED=1",
+      "WTF_USE_DYNAMIC_ANNOTATIONS=1",
+    ]
+  } else {
     defines += [ "NVALGRIND" ]
     if (!is_nacl) {
       # NaCl always enables dynamic annotations. Currently this value is set to
       # 1 for all .nexes.
       defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=0" ]
     }
   }
 }
 
 # Default libraries ------------------------------------------------------------
@@ skipping 62 matching lines @@
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreText.framework",
       "Foundation.framework",
       "UIKit.framework",
     ]
   } else if (is_linux) {
     libs = [ "dl" ]
   }
 }