From 7786acf0d7a2e274da5eb1200927d6edf6faec07 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@chromium.org>
Date: Wed, 26 Sep 2018 17:54:38 +0200
Subject: [PATCH] win: move string_number_conversion_test asan/dll disabling
 into the win clause

This fixes the upstreaming of https://chromium-review.googlesource.com/c/chromium/src/+/1113664

Bug: chromium:856174
Change-Id: I88cf6aeecef60e4eaf5c14dc9a66f0409255ccac
Reviewed-on: https://chromium-review.googlesource.com/1245481
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
---
 util/BUILD.gn | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/util/BUILD.gn b/util/BUILD.gn
index ec8d1daf..3ad253e0 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -641,11 +641,8 @@ source_set("util_test") {
       "win/scoped_process_suspend_test.cc",
       "win/session_end_watcher_test.cc",
     ]
-  }
 
-
-  if (crashpad_is_in_chromium) {
-    if (is_asan && is_component_build) {
+    if (crashpad_is_in_chromium && is_asan && is_component_build) {
       # TODO(crbug.com/856174): Re-enable these once Windows ASan is fixed.
       sources -= [ "stdlib/string_number_conversion_test.cc" ]
     }