win: Make asan work with isolates.

1. asan required disable_nacl=1 since there's no 64-bit runtime yet.
   disable_nacl=1 doesn't work with isolates.  Move the asan flags
   around a bit so that they're only applied to 32-bit targets.
   Now everything builds fine without disable_nacl=1

2. One isolate file was missing a <(EXECUTABLE_SUFFIX), add that.

BUG=416078
TEST=
* `ninja -C out\Release chrome_nacl_win64` builds correctly
* out\Release\obj\base\base.ninja still has asan flags,
  the base_unittests.exe link command still has asan flags

R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/871973004

Cr-Commit-Position: refs/heads/master@{#312967}

base/base.isolate

@@ -34,7 +34,7 @@
       'variables': {
         'files': [
           '../tools/valgrind/asan/',
-          '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer',
+          '../third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],

build/common.gypi

@@ -5549,9 +5549,51 @@
                 ],
               },
             }],
+          ],
+        },
+      },
+    }],
+    ['disable_nacl==1', {
+      'target_defaults': {
+        'defines': [
+          'DISABLE_NACL',
+        ],
+      },
+    }],
+    ['OS=="win" and msvs_use_common_linker_extras', {
+      'target_defaults': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'DelayLoadDLLs': [
+              'dbghelp.dll',
+              'dwmapi.dll',
+              'shell32.dll',
+              'uxtheme.dll',
+            ],
+          },
+        },
+        'configurations': {
+          'x86_Base': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'AdditionalOptions': [
+                  '/safeseh',
+                  '/dynamicbase',
+                  '/ignore:4199',
+                  '/ignore:4221',
+                  '/nxcompat',
+                ],
+              },
+              'conditions': [
+                ['syzyasan==0', {
+                  'VCLinkerTool': {
+                    'AdditionalOptions': ['/largeaddressaware'],
+                  },
+                }],
                 ['asan==1', {
-              # ASan on Windows is a work in progress and very experimental.
-              # See crbug.com/345874.
+                  # TODO(asan/win): Move this down into the general
+                  # win-target_defaults section once the 64-bit asan runtime
+                  # exists.  See crbug.com/345874.
                   'VCCLCompilerTool': {
                     'AdditionalOptions': [
                       '-fsanitize=address',
@@ -5598,45 +5640,6 @@
               ],
             },
           },
-    }],
-    ['disable_nacl==1', {
-      'target_defaults': {
-        'defines': [
-          'DISABLE_NACL',
-        ],
-      },
-    }],
-    ['OS=="win" and msvs_use_common_linker_extras', {
-      'target_defaults': {
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'DelayLoadDLLs': [
-              'dbghelp.dll',
-              'dwmapi.dll',
-              'shell32.dll',
-              'uxtheme.dll',
-            ],
-          },
-        },
-        'configurations': {
-          'x86_Base': {
-            'msvs_settings': {
-              'VCLinkerTool': {
-                'AdditionalOptions': [
-                  '/safeseh',
-                  '/dynamicbase',
-                  '/ignore:4199',
-                  '/ignore:4221',
-                  '/nxcompat',
-                ],
-                'conditions': [
-                  ['syzyasan==0', {
-                    'AdditionalOptions': ['/largeaddressaware'],
-                  }],
-                ],
-              },
-            },
-          },
           'x64_Base': {
             'msvs_settings': {
               'VCLinkerTool': {