Find Favicon in priority of icon_type.

chrome/browser/favicon/favicon_service.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 "chrome/browser/favicon/favicon_service.h"
 
 #include "base/hash.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/history_backend.h"
@@ skipping 277 matching lines @@
     CancelableTaskTracker::TaskId id =
         tracker->NewTrackedTaskId(&is_canceled_cb);
 
     FaviconResultsCallback cancelable_cb =
         Bind(&CancelOrRunFaviconResultsCallback, is_canceled_cb, callback);
     ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(
         params.profile, params.page_url, desired_scale_factors, cancelable_cb);
     return id;
   } else if (history_service_) {
     return history_service_->GetFaviconsForURL(params.page_url,
-                                               params.icon_types,
-                                               params.desired_size_in_dip,
-                                               desired_scale_factors,
-                                               callback,
-                                               tracker);
+        params.icon_types_priority, params.desired_size_in_dip,
+        desired_scale_factors, params.threshold_for_next_icon_types, callback,
+        tracker);
   } else {
     return RunWithEmptyResultAsync(callback, tracker);
   }
 }
 
 void FaviconService::RunFaviconImageCallbackWithBitmapResults(
     const FaviconImageCallback& callback,
     int desired_size_in_dip,
     const std::vector<chrome::FaviconBitmapResult>& favicon_bitmap_results) {
   chrome::FaviconImageResult image_result;
@@ skipping 51 matching lines @@
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false,
                                          &resized_bitmap_data)) {
     callback.Run(chrome::FaviconBitmapResult());
     return;
   }
 
   bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector(
       &resized_bitmap_data);
   callback.Run(bitmap_result);
 }