Remove some dead code in ResourceBundle

ui/base/resource/resource_bundle.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 "ui/base/resource/resource_bundle.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 24 matching lines @@
 
 namespace {
 
 // Font sizes relative to base font.
 const int kSmallFontSizeDelta = -2;
 const int kMediumFontSizeDelta = 3;
 const int kLargeFontSizeDelta = 8;
 
 ResourceBundle* g_shared_instance_ = NULL;
 
-// Returns the actual scale factor of |bitmap| given the image representations
-// which have already been added to |image|.
-// TODO(pkotwicz): Remove this once we are no longer loading 1x resources
-// as part of non 1x data packs.
-ui::ScaleFactor GetActualScaleFactor(const gfx::ImageSkia& image,
-                                     const SkBitmap& bitmap,
-                                     ui::ScaleFactor data_pack_scale_factor) {
-  if (image.isNull())
-    return data_pack_scale_factor;
-
-  return ui::GetScaleFactorFromScale(
-      static_cast<float>(bitmap.width()) / image.width());
-}
-
 bool ShouldHighlightMissingScaledResources() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kHighlightMissingScaledResources);
 }
 
 }  // namespace
 
 // An ImageSkiaSource that loads bitmaps for requested scale factor from
 // ResourceBundle on demand for given resource_id. It falls back
 // to the 1x bitmap if the bitmap for the requested scale factor does not
@@ skipping 575 matching lines @@
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
     bitmap.allocPixels();
     bitmap.eraseARGB(255, 255, 0, 0);
     empty_image_ = gfx::Image(bitmap);
   }
   return empty_image_;
 }
 
 }  // namespace ui