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

chrome/browser/ui/webui/fileicon_source_unittest.cc

Index: chrome/browser/ui/webui/fileicon_source_unittest.cc
diff --git a/chrome/browser/ui/webui/fileicon_source_unittest.cc b/chrome/browser/ui/webui/fileicon_source_unittest.cc
index bd5b555501f57b84cce487ceb11404eaf569030c..aef04ed4446e1d686e8d62df1c109aace88b9fe2 100644
--- a/chrome/browser/ui/webui/fileicon_source_unittest.cc
+++ b/chrome/browser/ui/webui/fileicon_source_unittest.cc
@@ -22,7 +22,7 @@ class TestFileIconSource : public FileIconSource {
 
   MOCK_METHOD4(FetchFileIcon,
                void(const base::FilePath& path,
-                    ui::ScaleFactor scale_factor,
+                    float scale_factor,
                     IconLoader::IconSize icon_size,
                     const content::URLDataSource::GotDataCallback& callback));
 
@@ -48,64 +48,51 @@ class FileIconSourceTest : public testing::Test {
 const struct FetchFileIconExpectation {
   const char* request_path;
   const base::FilePath::CharType* unescaped_path;
-  ui::ScaleFactor scale_factor;
+  float scale_factor;
   IconLoader::IconSize size;
 } kBasicExpectations[] = {
-  { "foo?bar", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "foo?bar&scale=2x", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_200P,
-    IconLoader::NORMAL },
-  { "foo?iconsize=small", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_100P,
+  { "foo?bar", FILE_PATH_LITERAL("foo"), 1.0f, IconLoader::NORMAL },
+  { "foo?bar&scale=2x", FILE_PATH_LITERAL("foo"), 2.0f, IconLoader::NORMAL },
+  { "foo?iconsize=small", FILE_PATH_LITERAL("foo"), 1.0f, IconLoader::SMALL },
+  { "foo?iconsize=normal", FILE_PATH_LITERAL("foo"), 1.0f, IconLoader::NORMAL },
+  { "foo?iconsize=large", FILE_PATH_LITERAL("foo"), 1.0f, IconLoader::LARGE },
+  { "foo?iconsize=asdf", FILE_PATH_LITERAL("foo"), 1.0f, IconLoader::NORMAL },
+  { "foo?blah=b&iconsize=small", FILE_PATH_LITERAL("foo"), 1.0f,
     IconLoader::SMALL },
-  { "foo?iconsize=normal", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "foo?iconsize=large", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_100P,
-    IconLoader::LARGE },
-  { "foo?iconsize=asdf", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "foo?blah=b&iconsize=small", FILE_PATH_LITERAL("foo"),
-    ui::SCALE_FACTOR_100P, IconLoader::SMALL },
-  { "foo?blah&iconsize=small", FILE_PATH_LITERAL("foo"), ui::SCALE_FACTOR_100P,
+  { "foo?blah&iconsize=small", FILE_PATH_LITERAL("foo"), 1.0f,
+    IconLoader::SMALL },
+  { "a%3Fb%26c%3Dd.txt?iconsize=small", FILE_PATH_LITERAL("a?b&c=d.txt"), 1.0f,
     IconLoader::SMALL },
-  { "a%3Fb%26c%3Dd.txt?iconsize=small", FILE_PATH_LITERAL("a?b&c=d.txt"),
-    ui::SCALE_FACTOR_100P, IconLoader::SMALL },
   { "a%3Ficonsize%3Dsmall?iconsize=large",
-    FILE_PATH_LITERAL("a?iconsize=small"), ui::SCALE_FACTOR_100P,
-    IconLoader::LARGE },
+    FILE_PATH_LITERAL("a?iconsize=small"), 1.0f, IconLoader::LARGE },
   { "o%40%23%24%25%26*()%20%2B%3D%3F%2C%3A%3B%22.jpg",
-    FILE_PATH_LITERAL("o@#$%&*() +=?,:;\".jpg"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
+    FILE_PATH_LITERAL("o@#$%&*() +=?,:;\".jpg"), 1.0f, IconLoader::NORMAL },
 #if defined(OS_WIN)
-  { "c:/foo/bar/baz", FILE_PATH_LITERAL("c:\\foo\\bar\\baz"),
-    ui::SCALE_FACTOR_100P, IconLoader::NORMAL },
-  { "/foo?bar=asdf&asdf", FILE_PATH_LITERAL("\\foo"), ui::SCALE_FACTOR_100P,
+  { "c:/foo/bar/baz", FILE_PATH_LITERAL("c:\\foo\\bar\\baz"), 1.0f,
+    IconLoader::NORMAL },
+  { "/foo?bar=asdf&asdf", FILE_PATH_LITERAL("\\foo"), 1.0f,
     IconLoader::NORMAL },
   { "c%3A%2Fusers%2Ffoo%20user%2Fbar.txt",
-    FILE_PATH_LITERAL("c:\\users\\foo user\\bar.txt"), ui::SCALE_FACTOR_100P,
+    FILE_PATH_LITERAL("c:\\users\\foo user\\bar.txt"), 1.0f,
     IconLoader::NORMAL },
   { "c%3A%2Fusers%2F%C2%A9%202000.pdf",
-    FILE_PATH_LITERAL("c:\\users\\\xa9 2000.pdf"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
+    FILE_PATH_LITERAL("c:\\users\\\xa9 2000.pdf"), 1.0f, IconLoader::NORMAL },
   { "%E0%B6%9A%E0%B6%BB%E0%B7%9D%E0%B6%B8%E0%B7%8A",
-    FILE_PATH_LITERAL("\x0d9a\x0dbb\x0ddd\x0db8\x0dca"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "%2Ffoo%2Fbar", FILE_PATH_LITERAL("\\foo\\bar"), ui::SCALE_FACTOR_100P,
+    FILE_PATH_LITERAL("\x0d9a\x0dbb\x0ddd\x0db8\x0dca"), 1.0f,
     IconLoader::NORMAL },
+  { "%2Ffoo%2Fbar", FILE_PATH_LITERAL("\\foo\\bar"), 1.0f, IconLoader::NORMAL },
   { "%2Fbaz%20(1).txt?iconsize=small", FILE_PATH_LITERAL("\\baz (1).txt"),
-    ui::SCALE_FACTOR_100P, IconLoader::SMALL },
+    1.0f, IconLoader::SMALL },
 #else
-  { "/foo/bar/baz", FILE_PATH_LITERAL("/foo/bar/baz"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "/foo?bar", FILE_PATH_LITERAL("/foo"), ui::SCALE_FACTOR_100P,
+  { "/foo/bar/baz", FILE_PATH_LITERAL("/foo/bar/baz"), 1.0f,
     IconLoader::NORMAL },
+  { "/foo?bar", FILE_PATH_LITERAL("/foo"), 1.0f, IconLoader::NORMAL },
   { "%2Ffoo%2f%E0%B6%9A%E0%B6%BB%E0%B7%9D%E0%B6%B8%E0%B7%8A",
     FILE_PATH_LITERAL("/foo/\xe0\xb6\x9a\xe0\xb6\xbb\xe0\xb7\x9d")
-    FILE_PATH_LITERAL("\xe0\xb6\xb8\xe0\xb7\x8a"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "%2Ffoo%2Fbar", FILE_PATH_LITERAL("/foo/bar"), ui::SCALE_FACTOR_100P,
-    IconLoader::NORMAL },
-  { "%2Fbaz%20(1).txt?iconsize=small", FILE_PATH_LITERAL("/baz (1).txt"),
-    ui::SCALE_FACTOR_100P, IconLoader::SMALL },
+    FILE_PATH_LITERAL("\xe0\xb6\xb8\xe0\xb7\x8a"), 1.0f, IconLoader::NORMAL },
+  { "%2Ffoo%2Fbar", FILE_PATH_LITERAL("/foo/bar"), 1.0f, IconLoader::NORMAL },
+  { "%2Fbaz%20(1).txt?iconsize=small", FILE_PATH_LITERAL("/baz (1).txt"), 1.0f,
+    IconLoader::SMALL },
 #endif
 };