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

Unified Diff: content/renderer/bmp_image_decoder_unittest.cc

Issue 12725006: Move image decoder unit tests to content_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now with more MANUAL_ 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: content/renderer/bmp_image_decoder_unittest.cc
diff --git a/webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp b/content/renderer/bmp_image_decoder_unittest.cc
similarity index 86%
rename from webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp
rename to content/renderer/bmp_image_decoder_unittest.cc
index a1938637a4f8bc6b63a3a750606222354d902a24..7675fbccf5a4f1b2bdcc42a3ee3dbddf1cd8bff8 100644
--- a/webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp
+++ b/content/renderer/bmp_image_decoder_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/test/image_decoder_test.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h"
-#include "webkit/tools/test_shell/image_decoder_unittest.h"
class BMPImageDecoderTest : public ImageDecoderTest {
public:
@@ -21,10 +21,10 @@ class BMPImageDecoderTest : public ImageDecoderTest {
static const int64 kThresholdSize = 10240;
};
-TEST_F(BMPImageDecoderTest, DecodingFast) {
+TEST_F(BMPImageDecoderTest, MANUAL_DecodingFast) {
TestDecoding(TEST_SMALLER, kThresholdSize);
}
-TEST_F(BMPImageDecoderTest, DecodingSlow) {
+TEST_F(BMPImageDecoderTest, MANUAL_DecodingSlow) {
TestDecoding(TEST_BIGGER, kThresholdSize);
}

Powered by Google App Engine
This is Rietveld 408576698