Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/views/location_bar/page_action_with_badge_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 "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/common/extensions/extension.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 
@@ skipping 18 matching lines @@
 
 int PageActionWithBadgeView::GetBuiltInHorizontalPadding() const {
   return GetBuiltInHorizontalPaddingImpl();
 }
 
 void PageActionWithBadgeView::Layout() {
   // We have 25 pixels of vertical space in the Omnibox to play with, so even
   // sized icons (such as 16x16) have either a 5 or a 4 pixel whitespace
   // (padding) above and below. It looks better to have the extra pixel above
   // the icon than below it, so we add a pixel. http://crbug.com/25708.
-  const SkBitmap& image = image_view()->GetImage();
+  const gfx::ImageSkia& image = image_view()->GetImage();
   int y = (image.height() + 1) % 2;  // Even numbers: 1px padding. Odd: 0px.
   image_view_->SetBounds(0, y, width(), height());
 }
 
 void PageActionWithBadgeView::UpdateVisibility(WebContents* contents,
                                                const GURL& url) {
   image_view_->UpdateVisibility(contents, url);
   SetVisible(image_view_->visible());
 }