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

chrome/common/favicon/favicon_url_parser.cc

Index: chrome/common/favicon/favicon_url_parser.cc
diff --git a/chrome/common/favicon/favicon_url_parser.cc b/chrome/common/favicon/favicon_url_parser.cc
index 95f35a9f2a89aa4a2c72a421d1a69051534e1610..4b64451f37dd8371cfdb2857a4b2874897ff86b0 100644
--- a/chrome/common/favicon/favicon_url_parser.cc
+++ b/chrome/common/favicon/favicon_url_parser.cc
@@ -7,7 +7,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "components/favicon_base/favicon_types.h"
 #include "net/url_request/url_request.h"
-#include "ui/base/layout.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/favicon_size.h"
 
@@ -39,7 +38,7 @@ bool ParseFaviconPath(const std::string& path,
   parsed->is_icon_url = false;
   parsed->url = "";
   parsed->size_in_dip = gfx::kFaviconSize;
-  parsed->scale_factor = ui::SCALE_FACTOR_100P;
+  parsed->scale_factor = 1.0f;
   parsed->path_index = -1;
 
   if (path.empty())
@@ -77,9 +76,10 @@ bool ParseFaviconPath(const std::string& path,
       // Only 64x64, 32x32 and 16x16 icons are supported.
       parsed->size_in_dip = gfx::kFaviconSize;
     }
-
+    float scale_factor = 1.0f;

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

Is this change necessary?

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

Done.

     if (!scale_str.empty())
-      webui::ParseScaleFactor(scale_str, &parsed->scale_factor);
+      webui::ParseScaleFactor(scale_str, &scale_factor);
+    parsed->scale_factor = scale_factor;
 
     // Return the default favicon (as opposed to a resized favicon) for
     // favicon sizes which are not cached by the favicon service.