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

chrome/common/favicon/favicon_url_parser.cc

 // Copyright 2013 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/common/favicon/favicon_url_parser.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "components/favicon_base/favicon_types.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/webui/web_ui_util.h"
@@ skipping 20 matching lines @@
 }  // namespace
 
 namespace chrome {
 
 bool ParseFaviconPath(const std::string& path,
                       int icon_types,
                       ParsedFaviconPath* parsed) {
   parsed->is_icon_url = false;
   parsed->url = "";
   parsed->size_in_dip = gfx::kFaviconSize;
-  parsed->scale_factor = 1.0f;
+  parsed->device_scale_factor = 1.0f;
   parsed->path_index = -1;
 
   if (path.empty())
     return false;
 
   size_t parsed_index = 0;
   if (HasSubstringAt(path, parsed_index, kLargestParameter)) {
     parsed_index += strlen(kLargestParameter);
     parsed->size_in_dip = 0;
   } else if (HasSubstringAt(path, parsed_index, kSizeParameter)) {
@@ skipping 18 matching lines @@
 
     if (!base::StringToInt(size_str, &parsed->size_in_dip))
       return false;
 
     if (parsed->size_in_dip != (gfx::kFaviconSize * 4) &&
         parsed->size_in_dip != (gfx::kFaviconSize * 2)) {
       // Only 64x64, 32x32 and 16x16 icons are supported.
       parsed->size_in_dip = gfx::kFaviconSize;
     }
     if (!scale_str.empty())
-      webui::ParseScaleFactor(scale_str, &parsed->scale_factor);
+      webui::ParseScaleFactor(scale_str, &parsed->device_scale_factor);
 
     // Return the default favicon (as opposed to a resized favicon) for
     // favicon sizes which are not cached by the favicon service.
     // Currently the favicon service caches:
     // - favicons of sizes "gfx::kFaviconSize * scale factor" px of type FAVICON
-    //   where scale factor is one of FaviconUtil::GetFaviconScaleFactors().
+    //   where scale factor is one of FaviconUtil::GetFaviconScales().
     // - the largest TOUCH_ICON / TOUCH_PRECOMPOSED_ICON
     if (parsed->size_in_dip != gfx::kFaviconSize &&
         icon_types == favicon_base::FAVICON)
       return false;
 
     parsed_index = slash + 1;
   }
 
   if (HasSubstringAt(path, parsed_index, kIconURLParameter)) {
     parsed_index += strlen(kIconURLParameter);
@@ skipping 23 matching lines @@
   // to translate favicon URLs using advanced parameters.
   // Example:
   //   "chrome-search://favicon/size/16@2x/<renderer-id>/<most-visited-id>"
   // would be translated to:
   //   "chrome-search://favicon/size/16@2x/<most-visited-item-with-given-id>".
   parsed->path_index = parsed_index;
   return true;
 }
 
 }  // namespace chrome