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

chrome/browser/favicon/favicon_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "ui/base/layout.h"
 
 class GURL;
 class HistoryService;
 struct ImportedFaviconUsage;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
 // backend behind the scenes.
 class FaviconService : public KeyedService {
  public:
@@ skipping 30 matching lines @@
   // |image| originate from.
   // TODO(pkotwicz): Enable constructing |image| from bitmaps from several
   // icon URLs.
 
   // Requests the favicon at |icon_url| of |icon_type| whose size most closely
   // matches |desired_size_in_dip|. If |desired_size_in_dip| is 0, the largest
   // favicon bitmap at |icon_url| is returned. |consumer| is notified when the
   // bits have been fetched. |icon_url| is the URL of the icon itself, e.g.
   // <http://www.google.com/favicon.ico>.
   // Each of the three methods below differs in the format of the callback and
-  // the requested scale factors. All of the scale factors supported by the
+  // the requested scales. All of the scale factors supported by the

[pkotwicz, 2014/06/20 00:35:41]

Find and replace 'scale factors' -> 'scales'

[oshima, 2014/06/20 04:16:33]

I intentionally left them as scale factors as they're ones defined in
GetSupoprtedScaleFactors not arbitrary scales. I changed it to "resource scale
factors" to be more explicit.

   // current platform (eg MacOS) are requested for GetFaviconImage().
   base::CancelableTaskTracker::TaskId GetFaviconImage(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       int desired_size_in_dip,
       const favicon_base::FaviconImageCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   base::CancelableTaskTracker::TaskId GetRawFavicon(
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       int desired_size_in_dip,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // The first argument for |callback| is the set of bitmaps for the passed in
   // URL and icon types whose pixel sizes best match the passed in
   // |desired_size_in_dip| at the scale factors supported by the current
   // platform (eg MacOS) in addition to 1x. The vector has at most one result
   // for each of the scale factors. There are less entries if a single result
   // is the best bitmap to use for several scale factors.
   base::CancelableTaskTracker::TaskId GetFavicon(
@@ skipping 25 matching lines @@
   // returned.
   base::CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch(
       const GURL& page_url,
       const std::vector<GURL>& icon_urls,
       int icon_types,
       int desired_size_in_dip,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Requests the favicons of any of |icon_types| whose pixel sizes most
-  // closely match |desired_size_in_dip| and desired scale factors for a web
+  // closely match |desired_size_in_dip| and desired scale for a web
   // page URL. If |desired_size_in_dip| is 0, the largest favicon for the web
   // page URL is returned. |callback| is run when the bits have been fetched.
   // |icon_types| can be any combination of IconType value, but only one icon
   // will be returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON and
   // FAVICON. Each of the three methods below differs in the format of the
-  // callback and the requested scale factors. All of the scale factors
+  // callback and the requested scales. All of the scale factors
   // supported by the current platform (eg MacOS) are requested for
   // GetFaviconImageForPageURL().
   // Note. |callback| is always run asynchronously.
   base::CancelableTaskTracker::TaskId GetFaviconImageForPageURL(
       const FaviconForPageURLParams& params,
       const favicon_base::FaviconImageCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   base::CancelableTaskTracker::TaskId GetRawFaviconForPageURL(
       const FaviconForPageURLParams& params,
-      ui::ScaleFactor desired_scale_factor,
+      float desired_favicon_scale,
       const favicon_base::FaviconRawBitmapCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // See HistoryService::GetLargestFaviconForPageURL().
   base::CancelableTaskTracker::TaskId GetLargestRawFaviconForPageURL(
       Profile* profile,
       const GURL& page_url,
       const std::vector<int>& icon_types,
       int minimum_size_in_pixels,
       const favicon_base::FaviconRawBitmapCallback& callback,
@@ skipping 91 matching lines @@
   void RunFaviconRawBitmapCallbackWithBitmapResults(
       const favicon_base::FaviconRawBitmapCallback& callback,
       int desired_size_in_pixel,
       const std::vector<favicon_base::FaviconRawBitmapResult>&
           favicon_bitmap_results);
 
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_