summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/image_decoder_unittest.h
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/test_shell/image_decoder_unittest.h')
-rw-r--r--webkit/tools/test_shell/image_decoder_unittest.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/image_decoder_unittest.h b/webkit/tools/test_shell/image_decoder_unittest.h
index 76fffee..103fb66 100644
--- a/webkit/tools/test_shell/image_decoder_unittest.h
+++ b/webkit/tools/test_shell/image_decoder_unittest.h
@@ -8,12 +8,6 @@
#include <string>
#include <vector>
-#if COMPILER(MSVC)
-#pragma warning(disable: 4355) // 'this' used in initializer list
-#endif
-
-#undef LOG
-
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/scoped_ptr.h"