Convert ui::ScaleFactor -> float in favicon/history code

chrome/browser/web_applications/update_shortcut_worker_win.cc

 // Copyright 2014 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/web_applications/update_shortcut_worker_win.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 84 matching lines @@
   unprocessed_icons_.pop_back();
 }
 
 void UpdateShortcutWorker::DidDownloadFavicon(
     int requested_size,
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_sizes) {
-  std::vector<ui::ScaleFactor> scale_factors;
-  scale_factors.push_back(ui::SCALE_FACTOR_100P);
+  std::vector<float> favicon_scales;
+  favicon_scales.push_back(1.0f);
 
   std::vector<size_t> closest_indices;
   SelectFaviconFrameIndices(original_sizes,
-                            scale_factors,
+                            favicon_scales,
                             requested_size,
                             &closest_indices,
                             NULL);
 
   SkBitmap bitmap;
   if (!bitmaps.empty()) {
      size_t closest_index = closest_indices[0];
      bitmap = bitmaps[closest_index];
   }
 
@@ skipping 116 matching lines @@
                  base::Unretained(this)));
   }
 }
 
 void UpdateShortcutWorker::DeleteMeOnUIThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   delete this;
 }
 
 }  // namespace web_app