Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/web_applications/web_app_ui.cc

 // Copyright (c) 2012 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/ui/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 341 matching lines @@
     gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bmp);
     // We are on the UI thread, and this image is needed from the FILE thread,
     // for creating shortcut icon files.
     image_skia.MakeThreadSafe();
     shortcut_info.favicon.Add(gfx::Image(image_skia));
   } else {
     // As described in UpdateShortcutInfoAndIconForApp, image contains all of
     // the icons, hackily put into a single ImageSkia. Separate them out into
     // individual ImageSkias and insert them into the icon family.
     const gfx::ImageSkia& multires_image_skia = image.AsImageSkia();
-    // NOTE: We do not call ImageSkia::EnsureRepsForSupportedScaleFactors here.
+    // NOTE: We do not call ImageSkia::EnsureRepsForSupportedScales here.
     // The image reps here are not really for different scale factors (ImageSkia
     // is just being used as a handy container for multiple images).
     std::vector<gfx::ImageSkiaRep> image_reps =
         multires_image_skia.image_reps();
     for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
          it != image_reps.end(); ++it) {
       gfx::ImageSkia image_skia(*it);
       image_skia.MakeThreadSafe();
       shortcut_info.favicon.Add(image_skia);
     }
@@ skipping 110 matching lines @@
   }
 
   // |info_list| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(&extension, info_list,
       base::Bind(&OnImageLoaded, shortcut_info, callback));
 }
 
 }  // namespace web_app