Convert ui::ScaleFactor -> float in favicon/history code

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 0e47a48a02e222055cb7665c8107b7436230adfa..2c2fedc254bd3e6b005b4be2f9f098d78fc5ccc9 100644
--- a/chrome/common/favicon/favicon_url_parser_unittest.cc
+++ b/chrome/common/favicon/favicon_url_parser_unittest.cc
@@ -43,7 +43,7 @@ TEST_F(FaviconUrlParserTest, ParsingNoExtraParams) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.device_scale_factor);
 }
 
 // Test parsing path with a 'size' parameter.
@@ -58,7 +58,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(32, parsed.size_in_dip);
-  EXPECT_EQ(1.0f, parsed.scale_factor);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 
   // Test parsing current 'size' parameter format.
   const std::string path3 = "size/32@1.4x/" + url;
@@ -66,7 +66,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(32, parsed.size_in_dip);
-  EXPECT_EQ(1.4f, parsed.scale_factor);
+  EXPECT_EQ(1.4f, parsed.device_scale_factor);
 
   // Test that we pick the ui::ScaleFactor which is closest to the passed in
   // scale factor.
@@ -75,7 +75,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(url, parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(1.41f, parsed.scale_factor);
+  EXPECT_EQ(1.41f, parsed.device_scale_factor);
 
   // Invalid cases.
   const std::string path5 = "size/" + url;
@@ -91,7 +91,7 @@ TEST_F(FaviconUrlParserTest, ParsingSizeParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ(path8, parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(1.0f, parsed.scale_factor);
+  EXPECT_EQ(1.0f, parsed.device_scale_factor);
 }
 
 // Test parsing path with the 'largest' parameter.
@@ -119,7 +119,7 @@ TEST_F(FaviconUrlParserTest, ParsingIconUrlParam) {
   EXPECT_TRUE(parsed.is_icon_url);
   EXPECT_EQ("http://www.google.com/favicon.ico", parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.device_scale_factor);
 }
 
 // Test parsing path with 'origin' parameter.
@@ -133,14 +133,14 @@ TEST_F(FaviconUrlParserTest, ParsingOriginParam) {
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ("https://www.google.ca/", parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.device_scale_factor);
 
   const std::string path12 = "origin/google.com";
   EXPECT_TRUE(chrome::ParseFaviconPath(path12, icon_types, &parsed));
   EXPECT_FALSE(parsed.is_icon_url);
   EXPECT_EQ("http://google.com/", parsed.url);
   EXPECT_EQ(16, parsed.size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.scale_factor);
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, parsed.device_scale_factor);
 }
 
 // Test parsing paths with both a 'size' parameter and a 'url modifier'
@@ -155,7 +155,7 @@ 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(1.4f, parsed.scale_factor);
+  EXPECT_EQ(1.4f, parsed.device_scale_factor);
 
   const std::string path14 =
       "largest/iconurl/http://www.google.com/favicon.ico";