From c7ac511388298511ae7eb38d8ebb4c15303be673 Mon Sep 17 00:00:00 2001
From: "scherkus@chromium.org"
 <scherkus@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Fri, 26 Apr 2013 08:12:00 +0000
Subject: [PATCH] Update ALLOW_THIS_IN_INITIALIZER_LIST macro to reflect its
 deprecatation.

In addition move C4355 to list of sanctioned compiler warning suppressions.

The warning was disabled globally for ~2 years, meaning the macro wasn't providing any value. Refer to bug and chromium-dev@ discussion for details.

BUG=234765

Review URL: https://chromiumcodereview.appspot.com/14472011

git-svn-id: http://src.chromium.org/svn/trunk/src/build@196671 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.gypi b/common.gypi
index fa829b3b7..795231a11 100644
--- a/common.gypi
+++ b/common.gypi
@@ -4053,12 +4053,12 @@
           '$(VSInstallDir)/VC/atlmfc/include',
         ],
         'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
-        'msvs_disabled_warnings': [4351, 4396, 4503, 4819,
+        'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819,
           # TODO(maruel): These warnings are level 4. They will be slowly
           # removed as code is fixed.
           4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
-          4310, 4355, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701,
-          4702, 4706,
+          4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4702,
+          4706,
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {