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

chrome/browser/history/history_service.cc

Index: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index a4746ed85882990b7abd34780499365e4f9b0bee..6ee3cc50c29c2f067ad30a92534fd06844d74f45 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -548,7 +548,7 @@ base::CancelableTaskTracker::TaskId HistoryService::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,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -563,7 +563,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFavicons(
                  icon_urls,
                  icon_types,
                  desired_size_in_dip,
-                 desired_scale_factors,
+                 desired_favicon_scales,
                  results),
       base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
 }
@@ -572,7 +572,7 @@ base::CancelableTaskTracker::TaskId HistoryService::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,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -587,7 +587,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
                  page_url,
                  icon_types,
                  desired_size_in_dip,
-                 desired_scale_factors,
+                 desired_favicon_scales,
                  results),
       base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
 }
@@ -617,7 +617,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetLargestFaviconForURL(
 base::CancelableTaskTracker::TaskId HistoryService::GetFaviconForID(
     favicon_base::FaviconID favicon_id,
     int desired_size_in_dip,
-    ui::ScaleFactor desired_scale_factor,
+    float desired_favicon_scale,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -631,7 +631,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconForID(
                  history_backend_.get(),
                  favicon_id,
                  desired_size_in_dip,
-                 desired_scale_factor,
+                 desired_favicon_scale,
                  results),
       base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
 }
@@ -642,7 +642,7 @@ HistoryService::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,
     const favicon_base::FaviconResultsCallback& callback,
     base::CancelableTaskTracker* tracker) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -658,7 +658,7 @@ HistoryService::UpdateFaviconMappingsAndFetch(
                  icon_urls,
                  icon_types,
                  desired_size_in_dip,
-                 desired_scale_factors,
+                 desired_favicon_scales,
                  results),
       base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
 }