components/image_fetcher: Expose RequestMetadata from ImageFetcher

components/suggestions/image_manager_unittest.cc

 // Copyright 2014 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 "components/suggestions/image_manager.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 31 matching lines @@
 
 typedef base::hash_map<std::string, ImageData> EntryMap;
 
 void AddEntry(const ImageData& d, EntryMap* map) { (*map)[d.url()] = d; }
 
 class MockImageFetcher : public ImageFetcher {
  public:
   MockImageFetcher() {}
   virtual ~MockImageFetcher() {}
   MOCK_METHOD3(StartOrQueueNetworkRequest,
-               void(const std::string&, const GURL&,
-                    base::Callback<void(const std::string&,
-                                        const gfx::Image&)>));
+               void(const std::string&,
+                    const GURL&,
+                    const ImageFetcherCallback&));
   MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
   MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName));
   MOCK_METHOD1(SetDesiredImageFrameSize, void(const gfx::Size&));
   MOCK_METHOD0(GetImageDecoder, image_fetcher::ImageDecoder*());
 };
 
 class ImageManagerTest : public testing::Test {
  public:
   ImageManagerTest()
       : mock_image_fetcher_(NULL),
@@ skipping 151 matching lines @@
   image_manager_->GetImageForURL(GURL(kTestUrl1),
                                  base::Bind(&ImageManagerTest::OnImageAvailable,
                                             base::Unretained(this), &run_loop));
   run_loop.Run();
 
   EXPECT_EQ(0, num_callback_null_called_);
   EXPECT_EQ(1, num_callback_valid_called_);
 }
 
 }  // namespace suggestions