Improve test coverage for ContentFaviconDriver

content/test/test_web_contents.cc

 // Copyright (c) 2012 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 "content/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
@@ skipping 75 matching lines @@
     rfh->SimulateNavigationStart(url);
   }
 }
 
 int TestWebContents::DownloadImage(const GURL& url,
                                    bool is_favicon,
                                    uint32_t max_bitmap_size,
                                    bool bypass_cache,
                                    const ImageDownloadCallback& callback) {
   static int g_next_image_download_id = 0;
-  return ++g_next_image_download_id;
+  ++g_next_image_download_id;
+  pending_image_downloads_[url].emplace_back(g_next_image_download_id,
+                                             callback);
+  return g_next_image_download_id;
 }
 
 void TestWebContents::TestDidNavigate(RenderFrameHost* render_frame_host,
                                       int nav_entry_id,
                                       bool did_create_new_entry,
                                       const GURL& url,
                                       ui::PageTransition transition) {
   TestDidNavigateWithReferrer(render_frame_host,
                               nav_entry_id,
                               did_create_new_entry,
@@ skipping 72 matching lines @@
   params.searchable_form_url = GURL();
   params.searchable_form_encoding = std::string();
 
   rfh->SendNavigateWithParams(&params);
 }
 
 const std::string& TestWebContents::GetSaveFrameHeaders() {
   return save_frame_headers_;
 }
 
+bool TestWebContents::HasPendingDownloadImage(const GURL& url) {
+  return !pending_image_downloads_[url].empty();
+}
+
+bool TestWebContents::TestDidDownloadImage(
+    const GURL& url,
+    int http_status_code,
+    const std::vector<SkBitmap>& bitmaps,
+    const std::vector<gfx::Size>& original_bitmap_sizes) {
+  if (!HasPendingDownloadImage(url))
+    return false;
+  int id = pending_image_downloads_[url].front().first;
+  ImageDownloadCallback callback = pending_image_downloads_[url].front().second;
+  pending_image_downloads_[url].pop_front();
+  callback.Run(id, http_status_code, url, bitmaps, original_bitmap_sizes);
+  return true;
+}
+
 bool TestWebContents::CrossProcessNavigationPending() {
   if (IsBrowserSideNavigationEnabled()) {
     return GetRenderManager()->speculative_render_frame_host_ != nullptr;
   }
   return GetRenderManager()->pending_frame_host() != nullptr;
 }
 
 bool TestWebContents::CreateRenderViewForRenderManager(
     RenderViewHost* render_view_host,
     int opener_frame_routing_id,
@@ skipping 181 matching lines @@
                                                   int route_id) {
 }
 
 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
                                            const Referrer& referrer,
                                            const std::string& headers) {
   save_frame_headers_ = headers;
 }
 
 }  // namespace content