GetScaleFactorForNativeView should return scale factor in float

ui/base/layout.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 "ui/base/layout.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 126 matching lines @@
     delete original_scale_factors_;
   } else {
     delete g_supported_scale_factors;
     g_supported_scale_factors = NULL;
   }
 }
 
 }  // namespace test
 
 #if !defined(OS_MACOSX)
-ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view) {
+float GetScaleFactorForNativeView(gfx::NativeView view) {
   gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
   if (screen->IsDIPEnabled()) {
     gfx::Display display = screen->GetDisplayNearestWindow(view);
-    return GetSupportedScaleFactor(display.device_scale_factor());
+    return display.device_scale_factor();
   }
-  return ui::SCALE_FACTOR_100P;
+  return 1.0f;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui