Index: webkit/tools/test_shell/image_decoder_unittest.h |
=================================================================== |
--- webkit/tools/test_shell/image_decoder_unittest.h (revision 43569) |
+++ webkit/tools/test_shell/image_decoder_unittest.h (working copy) |
@@ -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" |