Fix the dynamic browser action setIcon path to work with any size icon.

chrome/browser/ui/extensions/icon_with_badge_image_source.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/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 111 matching lines @@
 
 void IconWithBadgeImageSource::SetBadge(scoped_ptr<Badge> badge) {
   badge_ = std::move(badge);
 }
 
 void IconWithBadgeImageSource::Draw(gfx::Canvas* canvas) {
   if (icon_.IsEmpty())
     return;
 
   gfx::ImageSkia skia = icon_.AsImageSkia();
-  // TODO(estade): Fix setIcon and enable this on !MD.
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
-    if (rep.scale() != canvas->image_scale())
-      skia.AddRepresentation(ScaleImageSkiaRep(rep, canvas->image_scale()));
-  }
+  gfx::ImageSkiaRep rep = skia.GetRepresentation(canvas->image_scale());
+  if (rep.scale() != canvas->image_scale())
+    skia.AddRepresentation(ScaleImageSkiaRep(rep, canvas->image_scale()));
   if (grayscale_)
     skia = gfx::ImageSkiaOperations::CreateHSLShiftedImage(skia, {-1, 0, 0.6});
 
   int x_offset = std::floor((size().width() - icon_.Width()) / 2.0);
   int y_offset = std::floor((size().height() - icon_.Height()) / 2.0);
   canvas->DrawImageInt(skia, x_offset, y_offset);
 
   // Draw a badge on the provided browser action icon's canvas.
   PaintBadge(canvas);
 
@@ skipping 125 matching lines @@
   gfx::Point center_point(major_radius + 1, size().height() - (major_radius)-1);
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(SK_ColorTRANSPARENT);
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   canvas->DrawCircle(center_point, major_radius, paint);
   paint.setColor(decoration_color);
   canvas->DrawCircle(center_point, minor_radius, paint);
 }