Add a static method to WebPDecoder to decode WebP

components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm

 // Copyright 2011 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.
 
 #import "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/ios/ios_util.h"
 #include "base/mac/scoped_block.h"
@@ skipping 74 matching lines @@
     12, 0,  0,  0,  1,   7, 16, 17,  253, 15,  68,  68,  255, 3,  0,  0,  86,
     80, 56, 32, 24, 0,   0, 0,  48,  1,   0,   157, 1,   42,  1,  0,  1,  0,
     3,  0,  52, 37, 164, 0, 3,  112, 0,   254, 251, 253, 80,  0,
 };
 
 const char kTestUrl[] = "http://www.img.com";
 
 const char kWEBPHeaderResponse[] =
     "HTTP/1.1 200 OK\0Content-type: image/webp\0\0";
 
-// TODO(crbug.com/687921): Refactor this.
-class WebpDecoderDelegate : public webp_transcode::WebpDecoder::Delegate {
- public:
-  WebpDecoderDelegate() = default;
-  NSData* data() const { return decoded_image_; }
-
-  void OnFinishedDecoding(bool success) override {}
-  void SetImageFeatures(
-      size_t total_size,
-      webp_transcode::WebpDecoder::DecodedImageFormat format) override {
-    decoded_image_ = [[NSMutableData alloc] initWithCapacity:total_size];
-  }
-  void OnDataDecoded(NSData* data) override {
-    [decoded_image_ appendData:data];
-  }
-
- private:
-  ~WebpDecoderDelegate() override {}
-  NSMutableData* decoded_image_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebpDecoderDelegate);
-};
-
 // Returns a NSData object containing the decoded image.
 NSData* DecodedWebpImage() {
-  scoped_refptr<WebpDecoderDelegate> delegate(new WebpDecoderDelegate);
-  scoped_refptr<webp_transcode::WebpDecoder> decoder(
-      new webp_transcode::WebpDecoder(delegate.get()));
-  decoder->OnDataReceived([NSData
+  return webp_transcode::WebpDecoder::DecodeWebpImage([NSData
       dataWithBytes:reinterpret_cast<const char*>(kWEBPImage)
              length:sizeof(kWEBPImage)]);
-  return delegate->data();
 }
 
 }  // namespace
 
 namespace image_fetcher {
 
 class IOSImageDataFetcherWrapperTest : public PlatformTest {
  protected:
   IOSImageDataFetcherWrapperTest()
       : callback_([^(NSData* data) {
@@ skipping 109 matching lines @@
   EXPECT_TRUE(called_);
 }
 
 TEST_F(IOSImageDataFetcherWrapperTest, TestCallbacksNotCalledDuringDeletion) {
   image_fetcher_->FetchImageDataWebpDecoded(GURL(kTestUrl), callback_);
   image_fetcher_.reset();
   EXPECT_FALSE(called_);
 }
 
 }  // namespace image_fetcher