Reduce the use of ui::ScaleFactor in webui/favicon

chrome/browser/ui/webui/favicon_source.cc

Index: chrome/browser/ui/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 46cce9b82cf9dc957cca2ba43e8411d789c76380..80f0004427a5aa5709384d54e95905a9728c031e 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -79,6 +79,8 @@ void FaviconSource::StartDataRequest(
 
   GURL url(parsed.url);
 
+  ui::ScaleFactor scale_factor =
+      ui::GetSupportedScaleFactor(parsed.scale_factor);

[pkotwicz, 2014/05/20 03:31:19]

It is really confusing keeping track what it a float and what is a
ui::ScaleFactor now.

At one point, I did not want any floats to be named |scale_factor|.
Can you promise that when you rename ui::ScaleFactor to ui::ResourceScaleFactor
that you will rename all places which use ui::ResourceScaleFactor to something
unique to avoid confusion?

[oshima, 2014/05/20 18:23:28]

These will be renamed either

device_scale_factor (float) or

ui::ResourceScaleFactor/resource_scale_factor

   if (parsed.is_icon_url) {
     // TODO(michaelbai): Change GetRawFavicon to support combination of
     // IconType.
@@ -86,11 +88,11 @@ void FaviconSource::StartDataRequest(
         url,
         favicon_base::FAVICON,
         parsed.size_in_dip,
-        parsed.scale_factor,
+        scale_factor,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this),
                    IconRequest(
-                       callback, url, parsed.size_in_dip, parsed.scale_factor)),
+                       callback, url, parsed.size_in_dip, scale_factor)),
         &cancelable_task_tracker_);
   } else {
     // Intercept requests for prepopulated pages.
@@ -100,7 +102,7 @@ void FaviconSource::StartDataRequest(
         callback.Run(
             ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
-                parsed.scale_factor));
+                scale_factor));
         return;
       }
     }
@@ -108,13 +110,13 @@ void FaviconSource::StartDataRequest(
     favicon_service->GetRawFaviconForURL(
         FaviconService::FaviconForURLParams(url, icon_types_,
                                             parsed.size_in_dip),
-        parsed.scale_factor,
+        scale_factor,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this),
                    IconRequest(callback,
                                url,
                                parsed.size_in_dip,
-                               parsed.scale_factor)),
+                               scale_factor)),
         &cancelable_task_tracker_);
   }
 }
@@ -192,9 +194,9 @@ void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
       default_favicons_[favicon_index].get();
 
   if (!default_favicon) {
-    ui::ScaleFactor scale_factor = icon_request.scale_factor;
     default_favicon = ResourceBundle::GetSharedInstance()
-        .LoadDataResourceBytesForScale(resource_id, scale_factor);
+        .LoadDataResourceBytesForScale(resource_id,
+                                       icon_request.scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }