Update from https://crrev.com/329939

build/config/BUILD.gn

Index: build/config/BUILD.gn
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 1bd666bd24cf4ba09239420e5c109aee50126089..5eb5e0a1a0223c123a1a890241aeddcd2ad42a81 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -24,7 +24,7 @@ declare_args() {
   # TODO(maruel): This decision should be revisited because having an
   # official deterministic build has high value too but MSVC toolset can't
   # generate anything deterministic with WPO enabled AFAIK.
-  dont_embed_build_metadata = is_official_build
+  dont_embed_build_metadata = !is_official_build
 
   # Set to true to enable dcheck in Release builds.
   dcheck_always_on = false
@@ -41,11 +41,8 @@ declare_args() {
 #
 # For now we define these globally to match the current GYP build.
 config("feature_flags") {
-  # TODO(brettw) most of these need to be parameterized.
-  defines = [
-    "CHROMIUM_BUILD",
-    "V8_DEPRECATION_WARNINGS",  # Don't use deprecated V8 APIs anywhere.
-  ]
+  # TODO(brettw) this probably needs to be parameterized.
+  defines = [ "V8_DEPRECATION_WARNINGS" ]  # Don't use deprecated V8 APIs anywhere.
 
   if (cld_version > 0) {
     defines += [ "CLD_VERSION=$cld_version" ]
@@ -238,6 +235,18 @@ config("feature_flags") {
   } else if (safe_browsing_mode == 2) {
     defines += [ "MOBILE_SAFE_BROWSING" ]
     defines += [ "SAFE_BROWSING_SERVICE" ]
+  } else if (safe_browsing_mode == 3) {
+    defines += [ "MOBILE_SAFE_BROWSING" ]
+    defines += [ "SAFE_BROWSING_DB_REMOTE" ]
+    defines += [ "SAFE_BROWSING_SERVICE" ]
+  }
+  if (is_official_build) {
+    defines += [ "OFFICIAL_BUILD" ]
+  }
+  if (is_chrome_branded) {
+    defines += [ "GOOGLE_CHROME_BUILD" ]
+  } else {
+    defines += [ "CHROMIUM_BUILD" ]
   }
 }
 
@@ -271,6 +280,18 @@ config("debug") {
 
 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) {
+    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 ------------------------------------------------------------