Revert 157906 - Don't return unsupported scales frrom GetScaleFactorFromScale()

ui/base/layout_unittest.cc

Index: ui/base/layout_unittest.cc
===================================================================
--- ui/base/layout_unittest.cc	(revision 157908)
+++ ui/base/layout_unittest.cc	(working copy)
@@ -1,79 +0,0 @@
-// 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 "testing/gtest/include/gtest/gtest.h"
-
-namespace ui {
-
-TEST(LayoutTest, GetScaleFactorScale) {
-  EXPECT_FLOAT_EQ(1.0f, GetScaleFactorScale(SCALE_FACTOR_100P));
-  EXPECT_FLOAT_EQ(1.4f, GetScaleFactorScale(SCALE_FACTOR_140P));
-  EXPECT_FLOAT_EQ(1.8f, GetScaleFactorScale(SCALE_FACTOR_180P));
-  EXPECT_FLOAT_EQ(2.0f, GetScaleFactorScale(SCALE_FACTOR_200P));
-}
-
-TEST(LayoutTest, GetScaleFactorFromScaleNoneSupported) {
-  std::vector<ScaleFactor> original_supported_factors =
-      GetSupportedScaleFactors();
-
-  std::vector<ScaleFactor> supported_factors;
-  test::SetSupportedScaleFactors(supported_factors);
-  for (float scale = 0.1f; scale < 3.0f; scale += 0.1f)
-    EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(scale));
-
-  test::SetSupportedScaleFactors(original_supported_factors);
-}
-
-TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
-  std::vector<ScaleFactor> original_supported_factors =
-      GetSupportedScaleFactors();
-
-  std::vector<ScaleFactor> supported_factors;
-  supported_factors.push_back(SCALE_FACTOR_100P);
-  supported_factors.push_back(SCALE_FACTOR_180P);
-  test::SetSupportedScaleFactors(supported_factors);
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.1f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.9f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.0f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.39f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.41f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.8f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(2.0f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(999.0f));
-
-  test::SetSupportedScaleFactors(original_supported_factors);
-}
-
-TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
-  std::vector<ScaleFactor> original_supported_factors =
-      GetSupportedScaleFactors();
-
-  std::vector<ScaleFactor> supported_factors;
-  for (int factor = SCALE_FACTOR_100P; factor < NUM_SCALE_FACTORS; ++factor) {
-    supported_factors.push_back(static_cast<ScaleFactor>(factor));
-  }
-  test::SetSupportedScaleFactors(supported_factors);
-
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.1f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.9f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.0f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.19f));
-  EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.21f));
-  EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.3f));
-  EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.4f));
-  EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.59f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.61f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.7f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.89f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(1.91f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.0f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.1f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(999.0f));
-
-  test::SetSupportedScaleFactors(original_supported_factors);
-}
-
-}  // namespace ui