diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 22:46:31 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 22:46:31 +0000 |
| commit | dca5cbb44a2665ce7248d99fae0007ed344734cf (patch) | |
| tree | e77968d2f3f085d9cab529b1b68f54d4508850a0 /webkit/tools/test_shell/image_decoder_unittest.h | |
| parent | 7b44dee2620540809ccda43ab3041a5908d775e1 (diff) | |
| download | chromium_src-dca5cbb44a2665ce7248d99fae0007ed344734cf.zip chromium_src-dca5cbb44a2665ce7248d99fae0007ed344734cf.tar.gz chromium_src-dca5cbb44a2665ce7248d99fae0007ed344734cf.tar.bz2 | |
Port a few test_shell_tests. Now it runs 45 of them.
I removed some files from test_files because scons complains (warns)
when a file is both in test_files and input_files. So the files removed from
test_files also exist in input_files and at some pointed will be ported anyway.
I also made some linking stubs.
BUG=3674
Review URL: http://codereview.chromium.org/7974
Patch from Paweł Hajdan jr <phajdan.jr@gmail.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/image_decoder_unittest.h')
| -rw-r--r-- | webkit/tools/test_shell/image_decoder_unittest.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/image_decoder_unittest.h b/webkit/tools/test_shell/image_decoder_unittest.h index 3786b0a..52b72a6 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.h +++ b/webkit/tools/test_shell/image_decoder_unittest.h @@ -2,14 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <vector> +#ifndef WEBKIT_TOOLS_TEST_SHELL_IMAGE_DECODER_UNITTEST_H_ +#define WEBKIT_TOOLS_TEST_SHELL_IMAGE_DECODER_UNITTEST_H_ -#include "base/basictypes.h" -#include "testing/gtest/include/gtest/gtest.h" +#include <vector> #include "Vector.h" #include "ImageDecoder.h" +#undef LOG + +#include "base/basictypes.h" +#include "testing/gtest/include/gtest/gtest.h" + // If CALCULATE_MD5_SUMS is not defined, then this test decodes a handful of // image files and compares their MD5 sums to the stored sums on disk. // @@ -77,3 +82,4 @@ class ImageDecoderTest : public testing::Test { DISALLOW_EVIL_CONSTRUCTORS(ImageDecoderTest); }; +#endif // WEBKIT_TOOLS_TEST_SHELL_IMAGE_DECODER_UNITTEST_H_ |