Reduce the use of ui::ScaleFactor in webui/favicon

chrome/common/favicon/favicon_url_parser_unittest.cc

Index: chrome/common/favicon/favicon_url_parser_unittest.cc
diff --git a/chrome/common/favicon/favicon_url_parser_unittest.cc b/chrome/common/favicon/favicon_url_parser_unittest.cc
index 1ccd9ed1eb278710b321b6f87e6a28d0eee80b14..a50a775d7f414a5a5d1e8de01eb952196041568f 100644
--- a/chrome/common/favicon/favicon_url_parser_unittest.cc
+++ b/chrome/common/favicon/favicon_url_parser_unittest.cc
@@ -58,7 +58,9 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(32, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+  EXPECT_EQ(1.0f, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P,

[pkotwicz, 2014/05/20 03:31:19]

Nit: Remove this check. It checks the functionality of
ui::GetSupportedScaleFactor() which is unrelated.

[oshima, 2014/05/20 18:23:28]

Done.

+            ui::GetSupportedScaleFactor(parsed.scale_factor));
 
   // Test parsing current 'size' parameter format.
   const std::string path3 = "size/32@1.4x/" + url;
@@ -66,7 +68,9 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(32, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_140P, parsed.scale_factor);
+  EXPECT_EQ(1.4f, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_140P,
+            ui::GetSupportedScaleFactor(parsed.scale_factor));
 
   // Test that we pick the ui::ScaleFactor which is closest to the passed in
   // scale factor.
@@ -75,7 +79,9 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_140P, parsed.scale_factor);
+  EXPECT_EQ(1.41f, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_140P,
+            ui::GetSupportedScaleFactor(parsed.scale_factor));
 
   // Invalid cases.
   const std::string path5 = "size/" + url;
@@ -91,7 +97,9 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(path8, parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+  EXPECT_EQ(1.0f, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P,
+            ui::GetSupportedScaleFactor(parsed.scale_factor));
 }
 
 // Test parsing path with the 'largest' parameter.
@@ -155,7 +163,9 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParamAndUrlModifier) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ("https://www.google.ca/", parsed.url);
   EXPECT_EQ(32, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_140P, parsed.scale_factor);
+  EXPECT_EQ(1.4f, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_140P,
+            ui::GetSupportedScaleFactor(parsed.scale_factor));
 
   const std::string path14 =
       "largest/iconurl/http://www.google.com/favicon.ico";