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

chrome/browser/search/local_ntp_source.cc

Index: chrome/browser/search/local_ntp_source.cc
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index f6f649c7806ad53cd19a70b94a4df1fc557f169e..03f94e01a73a47f92ef8cd03aa27d0c8ea522b47 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -149,10 +149,11 @@ void LocalNtpSource::StartDataRequest(
     callback.Run(base::RefCountedString::TakeString(&config_data_js));
     return;
   }
-  ui::ScaleFactor scale_factor;
+  float scale;

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

Nit: default initialize

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

Done.

   std::string filename;
   webui::ParsePathAndScale(
-      GURL(GetLocalNtpPath() + stripped_path), &filename, &scale_factor);
+      GURL(GetLocalNtpPath() + stripped_path), &filename, &scale);
+  ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactor(scale);
   for (size_t i = 0; i < arraysize(kResources); ++i) {
     if (filename == kResources[i].filename) {
       scoped_refptr<base::RefCountedStaticMemory> response(