| Index: ios/chrome/browser/webp_transcode/webp_decoder_unittest.mm
|
| diff --git a/ios/chrome/browser/webp_transcode/webp_decoder_unittest.mm b/ios/chrome/browser/webp_transcode/webp_decoder_unittest.mm
|
| index 8ea01d91217de905078c4fbe731cf2a524d8b35d..e7b67f7da910b0be592815eea126361c67a9419e 100644
|
| --- a/ios/chrome/browser/webp_transcode/webp_decoder_unittest.mm
|
| +++ b/ios/chrome/browser/webp_transcode/webp_decoder_unittest.mm
|
| @@ -25,6 +25,10 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| +#error "This file requires ARC support."
|
| +#endif
|
| +
|
| namespace webp_transcode {
|
| namespace {
|
|
|
| @@ -171,11 +175,11 @@ TEST_F(WebpDecoderTest, DecodeToJpeg) {
|
| #endif
|
| // Load a WebP image from disk.
|
| base::scoped_nsobject<NSData> webp_image(
|
| - [LoadImage(base::FilePath("test.webp")) retain]);
|
| + LoadImage(base::FilePath("test.webp")));
|
| ASSERT_TRUE(webp_image != nil);
|
| // Load reference image.
|
| base::scoped_nsobject<NSData> jpg_image(
|
| - [LoadImage(base::FilePath("test.jpg")) retain]);
|
| + LoadImage(base::FilePath("test.jpg")));
|
| ASSERT_TRUE(jpg_image != nil);
|
| // Convert to JPEG.
|
| EXPECT_CALL(*delegate_, OnFinishedDecoding(true)).Times(1);
|
| @@ -195,11 +199,11 @@ TEST_F(WebpDecoderTest, DecodeToPng) {
|
| #endif
|
| // Load a WebP image from disk.
|
| base::scoped_nsobject<NSData> webp_image(
|
| - [LoadImage(base::FilePath("test_alpha.webp")) retain]);
|
| + LoadImage(base::FilePath("test_alpha.webp")));
|
| ASSERT_TRUE(webp_image != nil);
|
| // Load reference image.
|
| base::scoped_nsobject<NSData> png_image(
|
| - [LoadImage(base::FilePath("test_alpha.png")) retain]);
|
| + LoadImage(base::FilePath("test_alpha.png")));
|
| ASSERT_TRUE(png_image != nil);
|
| // Convert to PNG.
|
| EXPECT_CALL(*delegate_, OnFinishedDecoding(true)).Times(1);
|
| @@ -219,11 +223,11 @@ TEST_F(WebpDecoderTest, DecodeToTiff) {
|
| #endif
|
| // Load a WebP image from disk.
|
| base::scoped_nsobject<NSData> webp_image(
|
| - [LoadImage(base::FilePath("test_small.webp")) retain]);
|
| + LoadImage(base::FilePath("test_small.webp")));
|
| ASSERT_TRUE(webp_image != nil);
|
| // Load reference image.
|
| base::scoped_nsobject<NSData> tiff_image(
|
| - [LoadImage(base::FilePath("test_small.tiff")) retain]);
|
| + LoadImage(base::FilePath("test_small.tiff")));
|
| ASSERT_TRUE(tiff_image != nil);
|
| // Convert to TIFF.
|
| EXPECT_CALL(*delegate_, OnFinishedDecoding(true)).Times(1);
|
| @@ -243,11 +247,11 @@ TEST_F(WebpDecoderTest, StreamedDecode) {
|
| #endif
|
| // Load a WebP image from disk.
|
| base::scoped_nsobject<NSData> webp_image(
|
| - [LoadImage(base::FilePath("test.webp")) retain]);
|
| + LoadImage(base::FilePath("test.webp")));
|
| ASSERT_TRUE(webp_image != nil);
|
| // Load reference image.
|
| base::scoped_nsobject<NSData> jpg_image(
|
| - [LoadImage(base::FilePath("test.jpg")) retain]);
|
| + LoadImage(base::FilePath("test.jpg")));
|
| ASSERT_TRUE(jpg_image != nil);
|
| // Convert to JPEG in chunks.
|
| EXPECT_CALL(*delegate_, OnFinishedDecoding(true)).Times(1);
|
| @@ -257,11 +261,11 @@ TEST_F(WebpDecoderTest, StreamedDecode) {
|
| unsigned int num_chunks = 0;
|
| while ([webp_image length] > kChunkSize) {
|
| base::scoped_nsobject<NSData> chunk(
|
| - [[webp_image subdataWithRange:NSMakeRange(0, kChunkSize)] retain]);
|
| + [webp_image subdataWithRange:NSMakeRange(0, kChunkSize)]);
|
| decoder_->OnDataReceived(chunk);
|
| - webp_image.reset([[webp_image
|
| - subdataWithRange:NSMakeRange(kChunkSize, [webp_image length] -
|
| - kChunkSize)] retain]);
|
| + webp_image.reset([webp_image
|
| + subdataWithRange:NSMakeRange(kChunkSize,
|
| + [webp_image length] - kChunkSize)]);
|
| ++num_chunks;
|
| }
|
| if ([webp_image length] > 0u) {
|
|
|