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

Unified Diff: webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp

Issue 12725006: Move image decoder unit tests to content_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits addressed Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
diff --git a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
deleted file mode 100644
index dd6470294755d7067e0891e76a3d188b85820b88..0000000000000000000000000000000000000000
--- a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/files/file_path.h"
-#include "base/file_util.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h"
-#include "webkit/tools/test_shell/image_decoder_unittest.h"
-
-using WebKit::WebImageDecoder;
-
-class ICOImageDecoderTest : public ImageDecoderTest {
- public:
- ICOImageDecoderTest() : ImageDecoderTest("ico") { }
-
- protected:
- virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE {
- return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeICO);
- }
-};
-
-TEST_F(ICOImageDecoderTest, Decoding) {
- TestDecoding();
-}
-
-TEST_F(ICOImageDecoderTest, ImageNonZeroFrameIndex) {
- // Test that the decoder decodes multiple sizes of icons which have them.
- // Load an icon that has both favicon-size and larger entries.
- base::FilePath multisize_icon_path(data_dir_.AppendASCII("yahoo.ico"));
- const base::FilePath md5_sum_path(
- GetMD5SumPath(multisize_icon_path).value() + FILE_PATH_LITERAL("2"));
- static const int kDesiredFrameIndex = 3;
- TestWebKitImageDecoder(multisize_icon_path, md5_sum_path, kDesiredFrameIndex);
-}
« no previous file with comments | « webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp ('k') | webkit/tools/webcore_unit_tests/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698