Convert ui::ScaleFactor -> float in favicon/history code

chrome/browser/history/history_backend.cc

Index: chrome/browser/history/history_backend.cc
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 9a80dc98fb85d8a67fb5ed3391fa76198d411dce..71d34d65c02af3b102db7da6b1aa3d85e90a36ed 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -1567,10 +1567,10 @@ void HistoryBackend::GetFavicons(
     const std::vector<GURL>& icon_urls,
     int icon_types,
     int desired_size_in_dip,
-    const std::vector<ui::ScaleFactor>& desired_scale_factors,
+    const std::vector<float>& desired_favicon_scales,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   UpdateFaviconMappingsAndFetchImpl(NULL, icon_urls, icon_types,
-                                    desired_size_in_dip, desired_scale_factors,
+                                    desired_size_in_dip, desired_favicon_scales,
                                     bitmap_results);
 }
 
@@ -1673,27 +1673,27 @@ void HistoryBackend::GetFaviconsForURL(
     const GURL& page_url,
     int icon_types,
     int desired_size_in_dip,
-    const std::vector<ui::ScaleFactor>& desired_scale_factors,
+    const std::vector<float>& desired_favicon_scales,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   DCHECK(bitmap_results);
   GetFaviconsFromDB(page_url, icon_types, desired_size_in_dip,
-                    desired_scale_factors, bitmap_results);
+                    desired_favicon_scales, bitmap_results);
 }
 
 void HistoryBackend::GetFaviconForID(
     favicon_base::FaviconID favicon_id,
     int desired_size_in_dip,
-    ui::ScaleFactor desired_scale_factor,
+    float desired_favicon_scale,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   std::vector<favicon_base::FaviconID> favicon_ids;
   favicon_ids.push_back(favicon_id);
-  std::vector<ui::ScaleFactor> desired_scale_factors;
-  desired_scale_factors.push_back(desired_scale_factor);
+  std::vector<float> desired_favicon_scales;
+  desired_favicon_scales.push_back(desired_favicon_scale);
 
   // Get results from DB.
   GetFaviconBitmapResultsForBestMatch(favicon_ids,
                                       desired_size_in_dip,
-                                      desired_scale_factors,
+                                      desired_favicon_scales,
                                       bitmap_results);
 }
 
@@ -1702,10 +1702,10 @@ void HistoryBackend::UpdateFaviconMappingsAndFetch(
     const std::vector<GURL>& icon_urls,
     int icon_types,
     int desired_size_in_dip,
-    const std::vector<ui::ScaleFactor>& desired_scale_factors,
+    const std::vector<float>& desired_favicon_scales,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   UpdateFaviconMappingsAndFetchImpl(&page_url, icon_urls, icon_types,
-                                    desired_size_in_dip, desired_scale_factors,
+                                    desired_size_in_dip, desired_favicon_scales,
                                     bitmap_results);
 }
 
@@ -2006,7 +2006,7 @@ void HistoryBackend::UpdateFaviconMappingsAndFetchImpl(
     const std::vector<GURL>& icon_urls,
     int icon_types,
     int desired_size_in_dip,
-    const std::vector<ui::ScaleFactor>& desired_scale_factors,
+    const std::vector<float>& desired_favicon_scales,
     std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results) {
   // If |page_url| is specified, |icon_types| must be either a single icon
   // type or icon types which are equivalent.
@@ -2058,7 +2058,7 @@ void HistoryBackend::UpdateFaviconMappingsAndFetchImpl(
   }
 
   GetFaviconBitmapResultsForBestMatch(favicon_ids, desired_size_in_dip,
-      desired_scale_factors, bitmap_results);
+      desired_favicon_scales, bitmap_results);
 }
 
 void HistoryBackend::SetFaviconBitmaps(
@@ -2163,7 +2163,7 @@ bool HistoryBackend::GetFaviconsFromDB(
     const GURL& page_url,
     int icon_types,
     int desired_size_in_dip,
-    const std::vector<ui::ScaleFactor>& desired_scale_factors,
+    const std::vector<float>& desired_favicon_scales,
     std::vector<favicon_base::FaviconRawBitmapResult>* favicon_bitmap_results) {
   DCHECK(favicon_bitmap_results);
   favicon_bitmap_results->clear();
@@ -2184,7 +2184,7 @@ bool HistoryBackend::GetFaviconsFromDB(
 
   // Populate |favicon_bitmap_results| and |icon_url_sizes|.
   bool success = GetFaviconBitmapResultsForBestMatch(favicon_ids,
-      desired_size_in_dip, desired_scale_factors, favicon_bitmap_results);
+      desired_size_in_dip, desired_favicon_scales, favicon_bitmap_results);
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success && !favicon_bitmap_results->empty();
@@ -2193,7 +2193,7 @@ bool HistoryBackend::GetFaviconsFromDB(
 bool HistoryBackend::GetFaviconBitmapResultsForBestMatch(
     const std::vector<favicon_base::FaviconID>& candidate_favicon_ids,
     int desired_size_in_dip,
-    const std::vector<ui::ScaleFactor>& desired_scale_factors,
+    const std::vector<float>& desired_favicon_scales,
     std::vector<favicon_base::FaviconRawBitmapResult>* favicon_bitmap_results) {
   favicon_bitmap_results->clear();
 
@@ -2201,7 +2201,7 @@ bool HistoryBackend::GetFaviconBitmapResultsForBestMatch(
     return true;
 
   // Find the FaviconID and the FaviconBitmapIDs which best match
-  // |desired_size_in_dip| and |desired_scale_factors|.
+  // |desired_size_in_dip| and |desired_favicon_scales|.
   // TODO(pkotwicz): Select bitmap results from multiple favicons once
   // content::FaviconStatus supports multiple icon URLs.
   favicon_base::FaviconID best_favicon_id = 0;
@@ -2220,7 +2220,7 @@ bool HistoryBackend::GetFaviconBitmapResultsForBestMatch(
     std::vector<size_t> candidate_bitmap_indices;
     float score = 0;
     SelectFaviconFrameIndices(sizes,
-                              desired_scale_factors,
+                              desired_favicon_scales,
                               desired_size_in_dip,
                               &candidate_bitmap_indices,
                               &score);