Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/history/select_favicon_frames.cc

 // 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.
 
 #include "chrome/browser/history/select_favicon_frames.h"
 
 #include <set>
 
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 40 matching lines @@
 };
 
 size_t GetCandidateIndexWithBestScore(
     const std::vector<gfx::Size>& candidate_sizes_in_pixel,
     ui::ScaleFactor scale_factor,
     int desired_size_in_dip,
     float* score,
     ResizeMethod* resize_method) {
   DCHECK_NE(desired_size_in_dip, 0);
 
-  float scale = ui::GetImageScale(scale_factor);
+  float scale = ui::GetScaleFactorScale(scale_factor);
   int desired_size_in_pixel =
       static_cast<int>(desired_size_in_dip * scale + 0.5f);
 
   // Try to find an exact match.
   for (size_t i = 0; i < candidate_sizes_in_pixel.size(); ++i) {
     if (candidate_sizes_in_pixel[i].width() == desired_size_in_pixel &&
         candidate_sizes_in_pixel[i].height() == desired_size_in_pixel) {
       *score = 1;
       *resize_method = NONE;
       return i;
@@ skipping 100 matching lines @@
 
   if (match_score)
     *match_score = total_score / scale_factors.size();
 }
 
 // Resize |source_bitmap| using |resize_method|.
 SkBitmap GetResizedBitmap(const SkBitmap& source_bitmap,
                           int desired_size_in_dip,
                           ui::ScaleFactor scale_factor,
                           ResizeMethod resize_method) {
-  float scale = ui::GetImageScale(scale_factor);
+  float scale = ui::GetScaleFactorScale(scale_factor);
   int desired_size_in_pixel = static_cast<int>(
       desired_size_in_dip * scale + 0.5f);
 
   switch (resize_method) {
     case NONE:
       return source_bitmap;
     case SAMPLE_NEAREST_NEIGHBOUR:
       return SampleNearestNeighbor(source_bitmap, desired_size_in_pixel);
     case LANCZOS:
       return skia::ImageOperations::Resize(
@@ skipping 16 matching lines @@
   std::vector<SelectionResult> results;
   GetCandidateIndicesWithBestScores(original_sizes, scale_factors,
       desired_size, match_score, &results);
 
   gfx::ImageSkia multi_image;
   for (size_t i = 0; i < results.size(); ++i) {
     const SelectionResult& result = results[i];
     SkBitmap resized_bitmap = GetResizedBitmap(bitmaps[result.index],
         desired_size, result.scale_factor, result.resize_method);
     multi_image.AddRepresentation(
-        gfx::ImageSkiaRep(resized_bitmap,
-                          ui::GetImageScale(result.scale_factor)));
+        gfx::ImageSkiaRep(resized_bitmap, result.scale_factor));
   }
   return multi_image;
 }
 
 void SelectFaviconFrameIndices(
     const std::vector<gfx::Size>& frame_pixel_sizes,
     const std::vector<ui::ScaleFactor>& scale_factors,
     int desired_size,
     std::vector<size_t>* best_indices,
     float* match_score) {
   std::vector<SelectionResult> results;
   GetCandidateIndicesWithBestScores(frame_pixel_sizes, scale_factors,
       desired_size, match_score, &results);
 
   std::set<size_t> already_added;
   for (size_t i = 0; i < results.size(); ++i) {
     size_t index = results[i].index;
     // GetCandidateIndicesWithBestScores() will return duplicate indices if the
     // bitmap data with |frame_pixel_sizes[index]| should be used for multiple
     // scale factors. Remove duplicates here such that |best_indices| contains
     // no duplicates.
     if (already_added.find(index) == already_added.end()) {
       already_added.insert(index);
       best_indices->push_back(index);
     }
   }
 }