clang/win: Disable -Wexit-time-destructors for now, 2nd try.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 81ef8ece00a92691cd500949e5d721f5547846c6..6ded414512712e88be1400724b4a8a595c563407 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2936,7 +2936,8 @@
       ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
         'defines': ['OS_CHROMEOS=1'],
       }],
-      ['enable_wexit_time_destructors==1', {
+      ['enable_wexit_time_destructors==1 and OS!="win"', {
+        # TODO: Enable on Windows too, http://crbug.com/404525
         'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
       }],
       ['chromium_code==0', {
@@ -5406,7 +5407,6 @@
                   '-Wno-unused-private-field',
                   '-Wno-unused-value',
                   '-Wno-unused-variable',
-                  '-Wno-exit-time-destructors',  # TODO: http://crbug.com/404525
                   '-ferror-limit=1',
                 ],
               },