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

ui/base/webui/web_ui_util.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 "ui/base/webui/web_ui_util.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/debug/trace_event.h"
@@ skipping 58 matching lines @@
   CHECK(args->GetDouble(start_index++, &button));
   CHECK(args->GetBoolean(start_index++, &alt_key));
   CHECK(args->GetBoolean(start_index++, &ctrl_key));
   CHECK(args->GetBoolean(start_index++, &meta_key));
   CHECK(args->GetBoolean(start_index++, &shift_key));
   return ui::DispositionFromClick(
       button == 1.0, alt_key, ctrl_key, meta_key, shift_key);
 }
 
 bool ParseScaleFactor(const base::StringPiece& identifier,
-                      ui::ScaleFactor* scale_factor) {
-  *scale_factor = ui::SCALE_FACTOR_100P;
+                      float* scale_factor) {
+  *scale_factor = 1.0f;
   if (identifier.empty()) {
     LOG(WARNING) << "Invalid scale factor format: " << identifier;
     return false;
   }
 
   if (*identifier.rbegin() != 'x') {
     LOG(WARNING) << "Invalid scale factor format: " << identifier;
     return false;
   }
 
   double scale = 0;
   std::string stripped;
   identifier.substr(0, identifier.length() - 1).CopyToString(&stripped);
   if (!base::StringToDouble(stripped, &scale)) {
     LOG(WARNING) << "Invalid scale factor format: " << identifier;
     return false;
   }
-
-  *scale_factor = ui::GetSupportedScaleFactor(static_cast<float>(scale));
+  *scale_factor = scale;
   return true;
 }
 
 void ParsePathAndScale(const GURL& url,
                        std::string* path,
-                       ui::ScaleFactor* scale_factor) {
+                       float* scale_factor) {
   *path = net::UnescapeURLComponent(url.path().substr(1),
                                     (net::UnescapeRule::URL_SPECIAL_CHARS |
                                      net::UnescapeRule::SPACES));
   if (scale_factor)
-    *scale_factor = ui::SCALE_FACTOR_100P;
+    *scale_factor = 1.0f;
 
   // Detect and parse resource string ending in @<scale>x.
   std::size_t pos = path->rfind('@');
   if (pos != std::string::npos) {
     base::StringPiece stripped_path(*path);
-    ui::ScaleFactor factor;
+    float factor;
 
     if (ParseScaleFactor(stripped_path.substr(
             pos + 1, stripped_path.length() - pos - 1), &factor)) {
       // Strip scale factor specification from path.
       stripped_path.remove_suffix(stripped_path.length() - pos);
       stripped_path.CopyToString(path);
     }
     if (scale_factor)
       *scale_factor = factor;
   }
@@ skipping 21 matching lines @@
 #endif
 
   localized_strings->SetString("fontfamily", font_family);
   localized_strings->SetString("fontsize",
       l10n_util::GetStringUTF8(web_font_size_id));
   localized_strings->SetString("textdirection",
       base::i18n::IsRTL() ? "rtl" : "ltr");
 }
 
 }  // namespace webui