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

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search/local_ntp_source.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 131 matching lines @@
     const std::string& path,
     int render_process_id,
     int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   const std::string stripped_path = StripParameters(path);
   if (stripped_path == kConfigDataFilename) {
     std::string config_data_js = GetConfigData(profile_);
     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(
           ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
               kResources[i].identifier, scale_factor));
       callback.Run(response.get());
       return;
     }
   }
   callback.Run(NULL);
@@ skipping 24 matching lines @@
     }
   }
   return false;
 }
 
 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const {
   // Allow embedding of most visited iframes.
   return base::StringPrintf("frame-src %s;",
                             chrome::kChromeSearchMostVisitedUrl);
 }