Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale

ash/common/system/chromeos/power/power_status_view.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 "ash/common/system/chromeos/power/power_status_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/tray_power.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
@@ skipping 33 matching lines @@
   PowerStatus::Get()->AddObserver(this);
   OnPowerStatusChanged();
 }
 
 PowerStatusView::~PowerStatusView() {
   PowerStatus::Get()->RemoveObserver(this);
 }
 
 void PowerStatusView::OnPowerStatusChanged() {
   UpdateText();
-
-  // We do not show a battery icon in the material design system menu.
-  // TODO(tdanderson): Remove the non-MD code and the IconSet enum once
-  // material design is enabled by default. See crbug.com/614453.
-  if (MaterialDesignController::UseMaterialDesignSystemIcons())
-    return;
-
-  const PowerStatus::BatteryImageInfo info =
-      PowerStatus::Get()->GetBatteryImageInfo(PowerStatus::ICON_DARK);

[Peter Kasting, 2017/03/25 00:22:30]

This was the only non-test use of ICON_DARK.  Based on that and the comment
above, looks like its entire enum should go away and code should assume the
equivalent of ICON_LIGHT everywhere.

[danakj, 2017/03/31 20:49:04]

Done.

-  if (info != previous_battery_image_info_) {
-    icon_->SetImage(PowerStatus::Get()->GetBatteryImage(info));
-    icon_->SetVisible(true);
-    previous_battery_image_info_ = info;
-  }
 }
 
 void PowerStatusView::LayoutView() {
   if (default_view_right_align_) {
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                              kPaddingBetweenBatteryStatusAndIcon);
     SetLayoutManager(layout);
 
     AddChildView(percentage_label_);
@@ skipping 93 matching lines @@
 
 void PowerStatusView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial())
     return;
 
   node_data->role = ui::AX_ROLE_LABEL_TEXT;
   node_data->SetName(accessible_name_);
 }
 
 }  // namespace ash