Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale

ash/common/system/chromeos/power/power_status.h

 // Copyright (c) 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.
 
 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
 #define ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 211 matching lines @@
 
   // A helper function called by GetBatteryImageInfo(). Populates the
   // MD-specific fields of |info|.
   void CalculateBatteryImageInfoMd(BatteryImageInfo* info) const;
 
   // A helper function called by GetBatteryImageInfo(). Populates the
   // non-MD-specific fields of |info|.
   void CalculateBatteryImageInfoNonMd(BatteryImageInfo* info,
                                       const IconSet& icon_set) const;
 
+  // The size of the image GetBatteryImage will return, in DIP.
+  static gfx::Size GetBatteryImageSizeInDip();
+
   // Creates a new image that should be shown for the battery's current state.
-  gfx::ImageSkia GetBatteryImage(const BatteryImageInfo& info) const;
-
-  // A version of GetBatteryImage() that is used when material design is not
-  // enabled.
-  // TODO(tdanderson): Remove this once material design is enabled by default.
-  // See crbug.com/614453.
-  gfx::ImageSkia GetBatteryImageNonMd(const BatteryImageInfo& info) const;
+  gfx::ImageSkiaRep GetBatteryImage(const BatteryImageInfo& info,
+                                    float scale) const;
 
   // Returns an string describing the current state for accessibility.
   base::string16 GetAccessibleNameString(bool full_description) const;
 
   // Updates |proto_|. Does not notify observers.
   void SetProtoForTesting(const power_manager::PowerSupplyProperties& proto);
 
  protected:
   PowerStatus();
   ~PowerStatus() override;
 
  private:
   // Overriden from PowerManagerClient::Observer.
   void PowerChanged(const power_manager::PowerSupplyProperties& proto) override;
 
   base::ObserverList<Observer> observers_;
 
   // Current state.
   power_manager::PowerSupplyProperties proto_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerStatus);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_CHROMEOS_POWER_POWER_STATUS_H_