Cleanup image_fetcher::ImageFetcher

ios/chrome/browser/net/image_fetcher_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 "ios/chrome/browser/net/image_fetcher.h"
 
 #import <UIKit/UIKit.h>
 
-#include "base/mac/bind_objc_block.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/mac/scoped_block.h"
+#include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/thread_task_runner_handle.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/test_url_fetcher_factory.h"
-#include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 static unsigned char kJPGImage[] = {
     255,216,255,224,0,16,74,70,73,70,0,1,1,1,0,72,0,72,0,0,255,254,0,19,67,
     114,101,97,116,101,100,32,119,105,116,104,32,71,73,77,80,255,219,0,67,
     0,5,3,4,4,4,3,5,4,4,4,5,5,5,6,7,12,8,7,7,7,7,15,11,11,9,12,17,15,18,18,
@@ skipping 25 matching lines @@
     103,45,102,97,99,116,111,114,0,50,120,50,44,49,120,49,44,49,120,49,73,
     250,166,180,0,0,0,0,73,69,78,68,174,66,96,130
 };
 
 static unsigned char kWEBPImage[] = {
     82,73,70,70,74,0,0,0,87,69,66,80,86,80,56,88,10,0,0,0,16,0,0,0,0,0,0,0,0,0,
     65,76,80,72,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
 };
 
-static char kTestUrl[] = "http://www.img.com";
+static const char kTestUrl[] = "http://www.img.com";
+
+static const char kWEBPHeaderResponse[] =
+    "HTTP/1.1 200 OK\0Content-type: image/webp\0\0";
 
 }  // namespace
 
+// TODO(ios): remove the static_cast<UIImage*>(nil) once all the bots have
+// Xcode 6.0 or later installed, http://crbug.com/440857
+
 class ImageFetcherTest : public PlatformTest {
  protected:
   ImageFetcherTest()
       : pool_(new base::SequencedWorkerPool(1, "TestPool")),
         image_fetcher_(new image_fetcher::ImageFetcher(pool_)),
         result_(nil),
         called_(false) {
     callback_.reset(
         [^(const GURL& original_url, int http_response_code, NSData* data) {
             result_ = [UIImage imageWithData:data];
             called_ = true;
         } copy]);
     image_fetcher_->SetRequestContextGetter(
         new net::TestURLRequestContextGetter(
-            base::MessageLoopProxy::current()));
+            base::ThreadTaskRunnerHandle::Get()));
   }
 
   ~ImageFetcherTest() override { pool_->Shutdown(); }
 
   net::TestURLFetcher* SetupFetcher() {
     image_fetcher_->StartDownload(GURL(kTestUrl), callback_);
     EXPECT_EQ(static_cast<UIImage*>(nil), result_);
     EXPECT_EQ(false, called_);
     net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
     DCHECK(fetcher);
     DCHECK(fetcher->delegate());
     return fetcher;
   }
 
   base::MessageLoop loop_;
-  base::mac::ScopedBlock<image_fetcher::Callback> callback_;
+  base::mac::ScopedBlock<image_fetcher::ImageFetchedCallback> callback_;
   net::TestURLFetcherFactory factory_;
   scoped_refptr<base::SequencedWorkerPool> pool_;
   scoped_ptr<image_fetcher::ImageFetcher> image_fetcher_;
   UIImage* result_;
   bool called_;
 };
 
 TEST_F(ImageFetcherTest, TestError) {
   net::TestURLFetcher* fetcher = SetupFetcher();
   fetcher->set_response_code(404);
@@ skipping 18 matching lines @@
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   EXPECT_NE(static_cast<UIImage*>(nil), result_);
   EXPECT_TRUE(called_);
 }
 
 TEST_F(ImageFetcherTest, TestGoodWebP) {
   net::TestURLFetcher* fetcher = SetupFetcher();
   fetcher->set_response_code(200);
   fetcher->SetResponseString(
       std::string((char*)kWEBPImage, sizeof(kWEBPImage)));
-  std::string kZero = std::string("\0", 1);
-  std::string header_string = std::string("HTTP/1.1 200 OK") + kZero +
-      "Content-type: image/webp" + kZero + kZero;
   scoped_refptr<net::HttpResponseHeaders> headers(new net::HttpResponseHeaders(
-      header_string));
+      std::string(kWEBPHeaderResponse, arraysize(kWEBPHeaderResponse))));
   fetcher->set_response_headers(headers);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   pool_->FlushForTesting();
   base::RunLoop().RunUntilIdle();
   EXPECT_NE(static_cast<UIImage*>(nil), result_);
   EXPECT_TRUE(called_);
 }
 
 TEST_F(ImageFetcherTest, TestBadWebP) {
   net::TestURLFetcher* fetcher = SetupFetcher();
   fetcher->set_response_code(200);
   fetcher->SetResponseString("This is not a valid WebP image");
-  std::string kZero = std::string("\0", 1);
-  std::string header_string = std::string("HTTP/1.1 200 OK") + kZero +
-      "Content-type: image/webp" + kZero + kZero;
   scoped_refptr<net::HttpResponseHeaders> headers(new net::HttpResponseHeaders(
-      header_string));
+      std::string(kWEBPHeaderResponse, arraysize(kWEBPHeaderResponse))));
   fetcher->set_response_headers(headers);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   pool_->FlushForTesting();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(static_cast<UIImage*>(nil), result_);
   EXPECT_TRUE(called_);
 }
 
 TEST_F(ImageFetcherTest, DeleteDuringWebPDecoding) {
   net::TestURLFetcher* fetcher = SetupFetcher();
   fetcher->set_response_code(200);
   fetcher->SetResponseString(
       std::string((char*)kWEBPImage, sizeof(kWEBPImage)));
-  std::string kZero = std::string("\0", 1);
-  std::string header_string = std::string("HTTP/1.1 200 OK") + kZero +
-      "Content-type: image/webp" + kZero + kZero;
   scoped_refptr<net::HttpResponseHeaders> headers(new net::HttpResponseHeaders(
-      header_string));
+      std::string(kWEBPHeaderResponse, arraysize(kWEBPHeaderResponse))));
   fetcher->set_response_headers(headers);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   // Delete the image fetcher, and check that the callback is not called.
   image_fetcher_.reset();
   pool_->FlushForTesting();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(static_cast<UIImage*>(nil), result_);
   EXPECT_FALSE(called_);
 }
 
 TEST_F(ImageFetcherTest, TestCallbacksNotCalledDuringDeletion) {
   image_fetcher_->StartDownload(GURL(kTestUrl), callback_);
   image_fetcher_.reset();
   EXPECT_FALSE(called_);
 }