Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: webkit/tools/webcore_unit_tests/XBMImageDecoder_unittest.cpp

Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2008, Google Inc. 1 // Copyright (c) 2008, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "webkit/tools/test_shell/image_decoder_unittest.h" 31 #include "webkit/tools/test_shell/image_decoder_unittest.h"
32 32
33 #include "XBMImageDecoder.h" 33 #include "XBMImageDecoder.h"
34 34
35 class XBMImageDecoderTest : public ImageDecoderTest { 35 class XBMImageDecoderTest : public ImageDecoderTest {
36 public: 36 public:
37 XBMImageDecoderTest() : ImageDecoderTest("xbm") { } 37 XBMImageDecoderTest() : ImageDecoderTest(L"xbm") { }
38 38
39 protected: 39 protected:
40 virtual WebCore::ImageDecoder* CreateDecoder() const { 40 virtual WebCore::ImageDecoder* CreateDecoder() const {
41 return new WebCore::XBMImageDecoder(); 41 return new WebCore::XBMImageDecoder();
42 } 42 }
43 }; 43 };
44 44
45 TEST_F(XBMImageDecoderTest, Decoding) { 45 TEST_F(XBMImageDecoderTest, Decoding) {
46 TestDecoding(); 46 TestDecoding();
47 } 47 }
48 48
49 #ifndef CALCULATE_MD5_SUMS 49 #ifndef CALCULATE_MD5_SUMS
50 TEST_F(XBMImageDecoderTest, ChunkedDecoding) { 50 TEST_F(XBMImageDecoderTest, ChunkedDecoding) {
51 TestChunkedDecoding(); 51 TestChunkedDecoding();
52 } 52 }
53 #endif 53 #endif
OLDNEW
« no previous file with comments | « webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698