GetScaleFactorForNativeView should return scale factor in float

chrome/browser/ui/views/create_application_shortcut_view.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/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 477 matching lines @@
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
   if (id != pending_download_id_)
     return;
   pending_download_id_ = -1;
 
   SkBitmap image;
 
   if (!bitmaps.empty()) {
     std::vector<ui::ScaleFactor> scale_factors;
-    ui::ScaleFactor scale_factor = ui::GetScaleFactorForNativeView(
-        web_contents_->GetRenderViewHost()->GetView()->GetNativeView());
+    ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactor(
+        ui::GetScaleFactorForNativeView(
+            web_contents_->GetRenderViewHost()->GetView()->GetNativeView()));
     scale_factors.push_back(scale_factor);
     std::vector<size_t> closest_indices;
     SelectFaviconFrameIndices(original_bitmap_sizes,
                               scale_factors,
                               requested_size,
                               &closest_indices,
                               NULL);
     size_t closest_index = closest_indices[0];
     image = bitmaps[closest_index];
   }
@@ skipping 44 matching lines @@
 }
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
     const web_app::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }