Revert 140877 - Rename DrawBitmapInt to DrawImageInt

Bug=None
Test=Compiles

Review URL: https://chromiumcodereview.appspot.com/10512021

TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10546037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140882 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 152 insertions, 152 deletions

diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index 923151d..9fb2c37 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -169,10 +169,10 @@ const gfx::ImageSkia GetVpnResource(int resource_id) {
   const gfx::ImageSkia* ethernet_icon = rb.GetImageSkiaNamed(resource_id);
   gfx::Canvas canvas(
       gfx::Size(ethernet_icon->width(), ethernet_icon->height()), false);
-  canvas.DrawImageInt(*ethernet_icon, 0, 0);
+  canvas.DrawBitmapInt(*ethernet_icon, 0, 0);
   const gfx::ImageSkia* vpn_badge = rb.GetImageSkiaNamed(kVpnBadgeId);
   int y = ethernet_icon->height() - vpn_badge->height();
-  canvas.DrawImageInt(*vpn_badge, kBadgeLeftX, y);
+  canvas.DrawBitmapInt(*vpn_badge, kBadgeLeftX, y);
   return canvas.ExtractBitmap();
 }
 
@@ -748,19 +748,19 @@ const gfx::ImageSkia NetworkMenuIcon::GenerateImageFromComponents(
     canvas.sk_canvas()->scale(SkFloatToScalar(dip_scale),
                               SkFloatToScalar(dip_scale));
     if (top_left_badge)
-      canvas.DrawImageInt(*top_left_badge, kBadgeLeftX, kBadgeTopY);
+      canvas.DrawBitmapInt(*top_left_badge, kBadgeLeftX, kBadgeTopY);
     if (top_right_badge)
-      canvas.DrawImageInt(*top_right_badge,
-                          dip_width - top_right_badge->width(),
-                          kBadgeTopY);
+      canvas.DrawBitmapInt(*top_right_badge,
+                           dip_width - top_right_badge->width(),
+                           kBadgeTopY);
     if (bottom_left_badge)
-      canvas.DrawImageInt(*bottom_left_badge,
-                          kBadgeLeftX,
-                          dip_height - bottom_left_badge->height());
+      canvas.DrawBitmapInt(*bottom_left_badge,
+                           kBadgeLeftX,
+                           dip_height - bottom_left_badge->height());
     if (bottom_right_badge)
-      canvas.DrawImageInt(*bottom_right_badge,
-                          dip_width - bottom_right_badge->width(),
-                          dip_height - bottom_right_badge->height());
+      canvas.DrawBitmapInt(*bottom_right_badge,
+                           dip_width - bottom_right_badge->width(),
+                           dip_height - bottom_right_badge->height());
     badged.AddBitmapForScale(canvas.ExtractBitmap(), dip_scale);
   }
   return badged;
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 82daaad..1119df0 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -234,10 +234,10 @@ void PaintDownloadProgress(gfx::Canvas* canvas,
 
   // Draw the background progress image.
   SkPaint background_paint;
-  canvas->DrawImageInt(*background,
-                       background_bounds.x(),
-                       background_bounds.y(),
-                       background_paint);
+  canvas->DrawBitmapInt(*background,
+                        background_bounds.x(),
+                        background_bounds.y(),
+                        background_paint);
 
   // Layer the foreground progress image in an arc proportional to the download
   // progress. The arc grows clockwise, starting in the midnight position, as
@@ -286,10 +286,10 @@ void PaintDownloadProgress(gfx::Canvas* canvas,
     return;
   }
 
-  canvas->DrawImageInt(*foreground,
-                       foreground_bounds.x(),
-                       foreground_bounds.y(),
-                       foreground_paint);
+  canvas->DrawBitmapInt(*foreground,
+                        foreground_bounds.x(),
+                        foreground_bounds.y(),
+                        foreground_paint);
 }
 
 void PaintDownloadComplete(gfx::Canvas* canvas,
@@ -320,7 +320,7 @@ void PaintDownloadComplete(gfx::Canvas* canvas,
   // at zero opacity.
   canvas->SaveLayerAlpha(GetOpacity(animation_progress), complete_bounds);
   canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
-  canvas->DrawImageInt(*complete, complete_bounds.x(), complete_bounds.y());
+  canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y());
   canvas->Restore();
 }
 
@@ -352,7 +352,7 @@ void PaintDownloadInterrupted(gfx::Canvas* canvas,
   // at full opacity.
   canvas->SaveLayerAlpha(GetOpacity(1.0 - animation_progress), complete_bounds);
   canvas->sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
-  canvas->DrawImageInt(*complete, complete_bounds.x(), complete_bounds.y());
+  canvas->DrawBitmapInt(*complete, complete_bounds.x(), complete_bounds.y());
   canvas->Restore();
 }
 
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index 7f57da2..c81fee6 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -28,7 +28,7 @@ static SkBitmap ApplyPadding(const SkBitmap& source,
   scoped_ptr<gfx::Canvas> result(
       new gfx::Canvas(gfx::Size(source.width() + padding.width(),
                                 source.height() + padding.height()), false));
-  result->DrawImageInt(
+  result->DrawBitmapInt(
       source,
       0, 0, source.width(), source.height(),
       padding.left(), padding.top(), source.width(), source.height(),
diff --git a/chrome/browser/profiles/profile_info_util.cc b/chrome/browser/profiles/profile_info_util.cc
index 83d38f5..a76787d 100644
--- a/chrome/browser/profiles/profile_info_util.cc
+++ b/chrome/browser/profiles/profile_info_util.cc
@@ -26,7 +26,7 @@ gfx::Image GetAvatarIconForMenu(const gfx::Image& image,
   // Draw the icon centered on the canvas.
   int x = (kAvatarIconWidth - length) / 2;
   int y = (kAvatarIconHeight - length) / 2;
-  canvas.DrawImageInt(bmp, x, y);
+  canvas.DrawBitmapInt(bmp, x, y);
 
   // Draw a gray border on the inside of the icon.
   SkColor color = SkColorSetARGB(83, 0, 0, 0);
@@ -48,7 +48,7 @@ gfx::Image GetAvatarIconForWebUI(const gfx::Image& image,
   // Draw the icon centered on the canvas.
   int x = (kAvatarIconWidth - length) / 2;
   int y = (kAvatarIconHeight - length) / 2;
-  canvas.DrawImageInt(bmp, x, y);
+  canvas.DrawBitmapInt(bmp, x, y);
 
   return gfx::Image(canvas.ExtractBitmap());
 }
@@ -71,7 +71,7 @@ gfx::Image GetAvatarIconForTitleBar(const gfx::Image& image,
   int x2 = x1 + length;
   int y1 = dst_height - length - 1;
   int y2 = y1 + length;
-  canvas.DrawImageInt(bmp, x1, y1);
+  canvas.DrawBitmapInt(bmp, x1, y1);
 
   // Give the icon an etched look by drawing a highlight on the bottom edge
   // and a shadow on the remaining edges.
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
index 1a652cc..ee1c26e 100644
--- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
+++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
@@ -216,7 +216,7 @@ void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
     gfx::Rect check_rect(0, 0, check_image->width(), check_image->height());
     int y = avatar_image->height() - check_image->height();
     int x = avatar_image->width() - check_image->width() + kCheckMarkXOffset;
-    canvas.DrawImageInt(*check_image, x, y);
+    canvas.DrawBitmapInt(*check_image, x, y);
 
     SkBitmap final_image = canvas.ExtractBitmap();
     avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(final_image);
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
index 2351096..364a22d 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
@@ -686,9 +686,9 @@ gboolean BrowserToolbarGtk::OnWrenchMenuButtonExpose(GtkWidget* sender,
   gfx::CanvasSkiaPaint canvas(expose, false);
   int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width();
   int y_offset = 0;
-  canvas.DrawImageInt(*badge,
-                      allocation.x + x_offset,
-                      allocation.y + y_offset);
+  canvas.DrawBitmapInt(*badge,
+                       allocation.x + x_offset,
+                       allocation.y + y_offset);
 
   return FALSE;
 }
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index 35118a2..2c97f49 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -872,7 +872,7 @@ gboolean DownloadItemGtk::OnProgressAreaExpose(GtkWidget* widget,
   // there is no need to use the chromium-specific default download item icon.
   if (icon_small_) {
     const int offset = download_util::kSmallProgressIconOffset;
-    canvas.DrawImageInt(*icon_small_->ToSkBitmap(),
+    canvas.DrawBitmapInt(*icon_small_->ToSkBitmap(),
         allocation.x + offset, allocation.y + offset);
   }
 
diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
index 4e5ff10..cdac8db 100644
--- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc
@@ -86,10 +86,10 @@ void ExtensionInfoBarGtk::OnImageLoaded(const gfx::Image& image,
   scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
       gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
                 image_size), false));
-  canvas->DrawImageInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
-                       image_size, image_size, false);
-  canvas->DrawImageInt(*drop_image, image_size + kDropArrowLeftMargin,
-                       image_size / 2);
+  canvas->DrawBitmapInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
+                        image_size, image_size, false);
+  canvas->DrawBitmapInt(*drop_image, image_size + kDropArrowLeftMargin,
+                        image_size / 2);
 
   SkBitmap bitmap = canvas->ExtractBitmap();
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc
index ffa5c7e..78b7cd6 100644
--- a/chrome/browser/ui/panels/panel_browser_frame_view.cc
+++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc
@@ -698,17 +698,17 @@ void PanelBrowserFrameView::PaintFrameBackground(gfx::Canvas* canvas) {
   // transition which looks bad.
 
   // Left border, below title-bar.
-  canvas->DrawImageInt(*image, 0, top_area_height - 1, thickness, 1,
+  canvas->DrawBitmapInt(*image, 0, top_area_height - 1, thickness, 1,
       0, top_area_height, thickness, height() - top_area_height, false);
 
   // Right border, below title-bar.
-  canvas->DrawImageInt(*image, (width() % image->width()) - thickness,
+  canvas->DrawBitmapInt(*image, (width() % image->width()) - thickness,
       top_area_height - 1, thickness, 1,
       width() - thickness, top_area_height,
       thickness, height() - top_area_height, false);
 
   // Bottom border.
-  canvas->DrawImageInt(*image, 0, top_area_height - 1, image->width(), 1,
+  canvas->DrawBitmapInt(*image, 0, top_area_height - 1, image->width(), 1,
       0, height() - thickness, width(), thickness, false);
 }
 
@@ -720,11 +720,11 @@ void PanelBrowserFrameView::PaintFrameEdge(gfx::Canvas* canvas) {
 
   // Draw the top border.
   const EdgeResources& frame_edges = GetFrameEdges();
-  canvas->DrawImageInt(*(frame_edges.top_left), 0, 0);
+  canvas->DrawBitmapInt(*(frame_edges.top_left), 0, 0);
   canvas->TileImageInt(
       *(frame_edges.top), frame_edges.top_left->width(), 0,
       width() - frame_edges.top_right->width(), frame_edges.top->height());
-  canvas->DrawImageInt(
+  canvas->DrawBitmapInt(
       *(frame_edges.top_right),
       width() - frame_edges.top_right->width(), 0);
 
@@ -736,7 +736,7 @@ void PanelBrowserFrameView::PaintFrameEdge(gfx::Canvas* canvas) {
           frame_edges.bottom_right->height());
 
   // Draw the bottom border.
-  canvas->DrawImageInt(
+  canvas->DrawBitmapInt(
       *(frame_edges.bottom_right),
       width() - frame_edges.bottom_right->width(),
       height() - frame_edges.bottom_right->height());
@@ -746,7 +746,7 @@ void PanelBrowserFrameView::PaintFrameEdge(gfx::Canvas* canvas) {
       width() - frame_edges.bottom_left->width() -
           frame_edges.bottom_right->width(),
       frame_edges.bottom->height());
-  canvas->DrawImageInt(
+  canvas->DrawBitmapInt(
       *(frame_edges.bottom_left), 0,
       height() - frame_edges.bottom_left->height());
 
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
index f14d929..46f50f2 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
@@ -617,8 +617,8 @@ void AutocompleteResultView::OnPaint(gfx::Canvas* canvas) {
   if (!match_.associated_keyword.get() ||
       keyword_icon_->x() > icon_bounds_.right()) {
     // Paint the icon.
-    canvas->DrawImageInt(*GetIcon(), GetMirroredXForRect(icon_bounds_),
-                         icon_bounds_.y());
+    canvas->DrawBitmapInt(*GetIcon(), GetMirroredXForRect(icon_bounds_),
+                          icon_bounds_.y());
 
     // Paint the text.
     int x = GetMirroredXForRect(text_bounds_);
diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc
index bcab2e7..f78fdb2 100644
--- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc
+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc
@@ -325,10 +325,10 @@ gfx::ImageSkia ProfileItemView::GetBadgedIcon(const gfx::ImageSkia& icon) {
   int height = icon_rect.height() + badge->height() * kBadgeOverlapRatioY;
 
   gfx::Canvas canvas(gfx::Size(width, height), false);
-  canvas.DrawImageInt(icon, 0, 0, icon.width(), icon.height(), 0, 0,
-                      icon_rect.width(), icon_rect.height(), true);
-  canvas.DrawImageInt(*badge, width - badge->width(),
-                      height - badge->height());
+  canvas.DrawBitmapInt(icon, 0, 0, icon.width(), icon.height(), 0, 0,
+                       icon_rect.width(), icon_rect.height(), true);
+  canvas.DrawBitmapInt(*badge, width - badge->width(),
+                       height - badge->height());
   return canvas.ExtractBitmap();
 }
 
diff --git a/chrome/browser/ui/views/avatar_menu_button.cc b/chrome/browser/ui/views/avatar_menu_button.cc
index 6f1ef5d..154c97f 100644
--- a/chrome/browser/ui/views/avatar_menu_button.cc
+++ b/chrome/browser/ui/views/avatar_menu_button.cc
@@ -128,7 +128,7 @@ void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
   // incognito image has shadows at the top that make the apparent center below
   // the real center.
   int dst_y = Round((height() - dst_height) / 2.0);
-  canvas->DrawImageInt(button_icon_, 0, 0, button_icon_.width(),
+  canvas->DrawBitmapInt(button_icon_, 0, 0, button_icon_.width(),
       button_icon_.height(), dst_x, dst_y, dst_width, dst_height, false);
 }
 
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index b4a88e0..1dba4ef 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -894,12 +894,12 @@ void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
     }
     icon_x = GetMirroredXWithWidthInView(icon_x, icon->width());
     if (enabled()) {
-      canvas->DrawImageInt(*icon, icon_x, icon_y);
+      canvas->DrawBitmapInt(*icon, icon_x, icon_y);
     } else {
       // Use an alpha to make the image look disabled.
       SkPaint paint;
       paint.setAlpha(120);
-      canvas->DrawImageInt(*icon, icon_x, icon_y, paint);
+      canvas->DrawBitmapInt(*icon, icon_x, icon_y, paint);
     }
   }
 }
@@ -940,19 +940,19 @@ void DownloadItemView::PaintImages(gfx::Canvas* canvas,
                                    int x, int y, int height, int width) {
   int middle_height = height - top_image->height() - bottom_image->height();
   // Draw the top.
-  canvas->DrawImageInt(*top_image,
-                       0, 0, top_image->width(), top_image->height(),
-                       x, y, width, top_image->height(), false);
+  canvas->DrawBitmapInt(*top_image,
+                        0, 0, top_image->width(), top_image->height(),
+                        x, y, width, top_image->height(), false);
   y += top_image->height();
   // Draw the center.
-  canvas->DrawImageInt(*center_image,
-                       0, 0, center_image->width(), center_image->height(),
-                       x, y, width, middle_height, false);
+  canvas->DrawBitmapInt(*center_image,
+                        0, 0, center_image->width(), center_image->height(),
+                        x, y, width, middle_height, false);
   y += middle_height;
   // Draw the bottom.
-  canvas->DrawImageInt(*bottom_image,
-                       0, 0, bottom_image->width(), bottom_image->height(),
-                       x, y, width, bottom_image->height(), false);
+  canvas->DrawBitmapInt(*bottom_image,
+                        0, 0, bottom_image->width(), bottom_image->height(),
+                        x, y, width, bottom_image->height(), false);
 }
 
 void DownloadItemView::SetState(State body_state, State drop_down_state) {
diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc
index 4efcd28..4ef555b 100644
--- a/chrome/browser/ui/views/dropdown_bar_view.cc
+++ b/chrome/browser/ui/views/dropdown_bar_view.cc
@@ -77,12 +77,12 @@ void DropdownBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   SkPaint paint;
   paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
   // Draw left edge.
-  canvas->DrawImageInt(*left_alpha_mask_, 0, 0, left_edge_width, mask_height,
+  canvas->DrawBitmapInt(*left_alpha_mask_, 0, 0, left_edge_width, mask_height,
       0, 0, left_edge_width, height, false, paint);
 
   // Draw right edge.
   int x_right_edge = view->bounds().width() - right_edge_width;
-  canvas->DrawImageInt(*right_alpha_mask_, 0, 0, right_edge_width,
+  canvas->DrawBitmapInt(*right_alpha_mask_, 0, 0, right_edge_width,
       mask_height, x_right_edge, 0, right_edge_width, height, false, paint);
 }
 
@@ -115,7 +115,7 @@ void DropdownBarView::OnPaint(gfx::Canvas* canvas) {
      canvas->Translate(bounds().origin());
      OnPaintBackground(&animating_edges);
      OnPaintBorder(&animating_edges);
-     canvas->DrawImageInt(animating_edges.ExtractBitmap(), bounds().x(),
+     canvas->DrawBitmapInt(animating_edges.ExtractBitmap(), bounds().x(),
          animation_offset());
   }
 }
diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
index f6563ed..14e8ccd 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
@@ -118,9 +118,9 @@ class AppNonClientFrameViewAura::ControlView
     views::View::OnPaint(canvas);
 
     // Separator overlaps the left edge of the close button.
-    canvas->DrawImageInt(*separator_,
-                         close_button_->x(), 0);
-    canvas->DrawImageInt(*shadow_, 0, kShadowHeightStretch);
+    canvas->DrawBitmapInt(*separator_,
+                          close_button_->x(), 0);
+    canvas->DrawBitmapInt(*shadow_, 0, kShadowHeightStretch);
   }
 
   void ButtonPressed(views::Button* sender,
diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
index 2136ad0..946d58e 100644
--- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
@@ -361,11 +361,11 @@ void AppPanelBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   canvas->TileImageInt(*theme_frame, 0, 0, width(), theme_frame->height());
 
   // Top.
-  canvas->DrawImageInt(*top_left_corner, 0, 0);
+  canvas->DrawBitmapInt(*top_left_corner, 0, 0);
   canvas->TileImageInt(*top_edge, top_left_corner->width(), 0,
                        width() - top_right_corner->width(), top_edge->height());
-  canvas->DrawImageInt(*top_right_corner,
-                       width() - top_right_corner->width(), 0);
+  canvas->DrawBitmapInt(*top_right_corner,
+                        width() - top_right_corner->width(), 0);
 
   // Right.
   canvas->TileImageInt(*right_edge, width() - right_edge->width(),
@@ -373,15 +373,15 @@ void AppPanelBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
       height() - top_right_corner->height() - bottom_right_corner->height());
 
   // Bottom.
-  canvas->DrawImageInt(*bottom_right_corner,
-                       width() - bottom_right_corner->width(),
-                       height() - bottom_right_corner->height());
+  canvas->DrawBitmapInt(*bottom_right_corner,
+                        width() - bottom_right_corner->width(),
+                        height() - bottom_right_corner->height());
   canvas->TileImageInt(*bottom_edge, bottom_left_corner->width(),
       height() - bottom_edge->height(),
       width() - bottom_left_corner->width() - bottom_right_corner->width(),
       bottom_edge->height());
-  canvas->DrawImageInt(*bottom_left_corner, 0,
-                       height() - bottom_left_corner->height());
+  canvas->DrawBitmapInt(*bottom_left_corner, 0,
+                        height() - bottom_left_corner->height());
 
   // Left.
   canvas->TileImageInt(*left_edge, 0, top_left_corner->height(),
@@ -431,11 +431,11 @@ void AppPanelBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
 
   // Top.
   int top_edge_y = client_area_top - top->height();
-  canvas->DrawImageInt(*top_left, client_area_bounds.x() - top_left->width(),
-                       top_edge_y);
+  canvas->DrawBitmapInt(*top_left, client_area_bounds.x() - top_left->width(),
+                        top_edge_y);
   canvas->TileImageInt(*top, client_area_bounds.x(), top_edge_y,
                        client_area_bounds.width(), top->height());
-  canvas->DrawImageInt(*top_right, client_area_bounds.right(), top_edge_y);
+  canvas->DrawBitmapInt(*top_right, client_area_bounds.right(), top_edge_y);
 
   // Right.
   int client_area_bottom =
@@ -445,11 +445,11 @@ void AppPanelBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
                        right->width(), client_area_height);
 
   // Bottom.
-  canvas->DrawImageInt(*bottom_right, client_area_bounds.right(),
-                       client_area_bottom);
+  canvas->DrawBitmapInt(*bottom_right, client_area_bounds.right(),
+                        client_area_bottom);
   canvas->TileImageInt(*bottom, client_area_bounds.x(), client_area_bottom,
                        client_area_bounds.width(), bottom_right->height());
-  canvas->DrawImageInt(*bottom_left,
+  canvas->DrawBitmapInt(*bottom_left,
       client_area_bounds.x() - bottom_left->width(), client_area_bottom);
 
   // Left.
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 9f517bf..e909901 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -257,8 +257,8 @@ class ResizeCorner : public views::View {
 
     gfx::ImageSkia* image = ui::ResourceBundle::GetSharedInstance().
         GetImageSkiaNamed(IDR_TEXTAREA_RESIZER);
-    canvas->DrawImageInt(*image, width() - image->width(),
-                         height() - image->height());
+    canvas->DrawBitmapInt(*image, width() - image->width(),
+                          height() - image->height());
   }
 
   static gfx::Size GetSize() {
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
index fcc500d..7f90a74 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
@@ -307,23 +307,23 @@ void GlassBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
   paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
 
   // Mask out the top left corner.
-  canvas->DrawImageInt(*toolbar_left_mask, left_x, y, paint);
+  canvas->DrawBitmapInt(*toolbar_left_mask, left_x, y, paint);
 
   // Mask out the top right corner.
   int right_x =
       x + w + kContentEdgeShadowThickness - toolbar_right_mask->width();
-  canvas->DrawImageInt(*toolbar_right_mask, right_x, y, paint);
+  canvas->DrawBitmapInt(*toolbar_right_mask, right_x, y, paint);
 
   // Draw left edge.
-  canvas->DrawImageInt(*toolbar_left, left_x, y);
+  canvas->DrawBitmapInt(*toolbar_left, left_x, y);
 
   // Draw center edge.
   canvas->TileImageInt(*toolbar_center, left_x + toolbar_left->width(), y,
       right_x - (left_x + toolbar_left->width()), toolbar_center->height());
 
   // Right edge.
-  canvas->DrawImageInt(*tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
-                       right_x, y);
+  canvas->DrawBitmapInt(*tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
+                        right_x, y);
 
   // Draw the content/toolbar separator.
   canvas->FillRect(gfx::Rect(x + kClientEdgeThickness,
@@ -350,7 +350,7 @@ void GlassBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   gfx::ImageSkia* right = tp->GetImageSkiaNamed(IDR_CONTENT_RIGHT_SIDE);
   canvas->TileImageInt(*right, client_area_bounds.right(), client_area_top,
                        right->width(), client_area_height);
-  canvas->DrawImageInt(
+  canvas->DrawBitmapInt(
       *tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER),
       client_area_bounds.right(), client_area_bottom);
   gfx::ImageSkia* bottom = tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_CENTER);
@@ -359,7 +359,7 @@ void GlassBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
       bottom->height());
   gfx::ImageSkia* bottom_left =
       tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER);
-  canvas->DrawImageInt(*bottom_left,
+  canvas->DrawBitmapInt(*bottom_left,
       client_area_bounds.x() - bottom_left->width(), client_area_bottom);
   gfx::ImageSkia* left = tp->GetImageSkiaNamed(IDR_CONTENT_LEFT_SIDE);
   canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index f2f2674..942a23b 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -671,10 +671,10 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
 
   // Mask the left edge.
   int left_x = x - kContentEdgeShadowThickness;
-  canvas->DrawImageInt(*toolbar_left_mask, 0, 0, toolbar_left_mask->width(),
-                       split_point, left_x, y, toolbar_left_mask->width(),
-                       split_point, false, paint);
-  canvas->DrawImageInt(*toolbar_left_mask, 0,
+  canvas->DrawBitmapInt(*toolbar_left_mask, 0, 0, toolbar_left_mask->width(),
+                        split_point, left_x, y, toolbar_left_mask->width(),
+                        split_point, false, paint);
+  canvas->DrawBitmapInt(*toolbar_left_mask, 0,
       toolbar_left_mask->height() - bottom_edge_height,
       toolbar_left_mask->width(), bottom_edge_height, left_x, bottom_y,
       toolbar_left_mask->width(), bottom_edge_height, false, paint);
@@ -682,18 +682,18 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
   // Mask the right edge.
   int right_x =
       x + w - toolbar_right_mask->width() + kContentEdgeShadowThickness;
-  canvas->DrawImageInt(*toolbar_right_mask, 0, 0, toolbar_right_mask->width(),
-                       split_point, right_x, y, toolbar_right_mask->width(),
-                       split_point, false, paint);
-  canvas->DrawImageInt(*toolbar_right_mask, 0,
+  canvas->DrawBitmapInt(*toolbar_right_mask, 0, 0, toolbar_right_mask->width(),
+                        split_point, right_x, y, toolbar_right_mask->width(),
+                        split_point, false, paint);
+  canvas->DrawBitmapInt(*toolbar_right_mask, 0,
       toolbar_right_mask->height() - bottom_edge_height,
       toolbar_right_mask->width(), bottom_edge_height, right_x, bottom_y,
       toolbar_right_mask->width(), bottom_edge_height, false, paint);
   canvas->Restore();
 
-  canvas->DrawImageInt(*toolbar_left, 0, 0, toolbar_left->width(), split_point,
-                       left_x, y, toolbar_left->width(), split_point, false);
-  canvas->DrawImageInt(*toolbar_left, 0,
+  canvas->DrawBitmapInt(*toolbar_left, 0, 0, toolbar_left->width(), split_point,
+                        left_x, y, toolbar_left->width(), split_point, false);
+  canvas->DrawBitmapInt(*toolbar_left, 0,
       toolbar_left->height() - bottom_edge_height, toolbar_left->width(),
       bottom_edge_height, left_x, bottom_y, toolbar_left->width(),
       bottom_edge_height, false);
@@ -706,9 +706,9 @@ void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) {
 
   gfx::ImageSkia* toolbar_right = tp->GetImageSkiaNamed(
       IDR_CONTENT_TOP_RIGHT_CORNER);
-  canvas->DrawImageInt(*toolbar_right, 0, 0, toolbar_right->width(),
+  canvas->DrawBitmapInt(*toolbar_right, 0, 0, toolbar_right->width(),
       split_point, right_x, y, toolbar_right->width(), split_point, false);
-  canvas->DrawImageInt(*toolbar_right, 0,
+  canvas->DrawBitmapInt(*toolbar_right, 0,
       toolbar_right->height() - bottom_edge_height, toolbar_right->width(),
       bottom_edge_height, right_x, bottom_y, toolbar_right->width(),
       bottom_edge_height, false);
@@ -747,12 +747,12 @@ void OpaqueBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
     int top_edge_y = client_area_top - top_center->height();
     int height = client_area_top - top_edge_y;
 
-    canvas->DrawImageInt(*top_left, 0, 0, top_left->width(), height,
+    canvas->DrawBitmapInt(*top_left, 0, 0, top_left->width(), height,
         client_area_bounds.x() - top_left->width(), top_edge_y,
         top_left->width(), height, false);
     canvas->TileImageInt(*top_center, 0, 0, client_area_bounds.x(), top_edge_y,
       client_area_bounds.width(), std::min(height, top_center->height()));
-    canvas->DrawImageInt(*top_right, 0, 0, top_right->width(), height,
+    canvas->DrawBitmapInt(*top_right, 0, 0, top_right->width(), height,
         client_area_bounds.right(), top_edge_y,
         top_right->width(), height, false);
 
@@ -772,7 +772,7 @@ void OpaqueBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   gfx::ImageSkia* right = tp->GetImageSkiaNamed(IDR_CONTENT_RIGHT_SIDE);
   canvas->TileImageInt(*right, client_area_bounds.right(), image_top,
                        right->width(), image_height);
-  canvas->DrawImageInt(
+  canvas->DrawBitmapInt(
       *tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER),
       client_area_bounds.right(), client_area_bottom);
   gfx::ImageSkia* bottom = tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_CENTER);
@@ -781,7 +781,7 @@ void OpaqueBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
       bottom->height());
   gfx::ImageSkia* bottom_left =
       tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER);
-  canvas->DrawImageInt(*bottom_left,
+  canvas->DrawBitmapInt(*bottom_left,
       client_area_bounds.x() - bottom_left->width(), client_area_bottom);
   gfx::ImageSkia* left = tp->GetImageSkiaNamed(IDR_CONTENT_LEFT_SIDE);
   canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index edf4cef..0811dd7 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -125,10 +125,10 @@ void ExtensionInfoBar::OnImageLoaded(const gfx::Image& image,
   scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(
       gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(),
                 image_size), false));
-  canvas->DrawImageInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
-                       image_size, image_size, false);
-  canvas->DrawImageInt(*drop_image, image_size + kDropArrowLeftMargin,
-                       image_size / 2);
+  canvas->DrawBitmapInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0,
+                        image_size, image_size, false);
+  canvas->DrawBitmapInt(*drop_image, image_size + kDropArrowLeftMargin,
+                        image_size / 2);
   menu_->SetIcon(canvas->ExtractBitmap());
   menu_->SetVisible(true);
 
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
index d844093..686cc62 100644
--- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
+++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
@@ -88,9 +88,9 @@ void KeywordHintView::OnPaint(gfx::Canvas* canvas) {
                               kTabButtonImage->width(),
                               kTabButtonImage->height());
   tab_button_bounds.set_x(GetMirroredXForRect(tab_button_bounds));
-  canvas->DrawImageInt(*kTabButtonImage,
-                       tab_button_bounds.x(),
-                       tab_button_bounds.y());
+  canvas->DrawBitmapInt(*kTabButtonImage,
+                        tab_button_bounds.x(),
+                        tab_button_bounds.y());
 }
 
 gfx::Size KeywordHintView::GetPreferredSize() {
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
index 7f0e6a1..800a163 100644
--- a/chrome/browser/ui/views/tab_icon_view.cc
+++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -130,9 +130,9 @@ void TabIconView::PaintIcon(gfx::Canvas* canvas,
   int dest_h = static_cast<int>(float_src_h * scale);
 
   // Center the scaled image.
-  canvas->DrawImageInt(image, src_x, src_y, src_w, src_h,
-                       (width() - dest_w) / 2, (height() - dest_h) / 2, dest_w,
-                       dest_h, filter);
+  canvas->DrawBitmapInt(image, src_x, src_y, src_w, src_h,
+                        (width() - dest_w) / 2, (height() - dest_h) / 2, dest_w,
+                        dest_h, filter);
 }
 
 void TabIconView::OnPaint(gfx::Canvas* canvas) {
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index cdbc05d..34d7dca 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -105,10 +105,10 @@ void DrawIconCenter(gfx::Canvas* canvas,
   // NOTE: the clipping is a work around for 69528, it shouldn't be necessary.
   canvas->Save();
   canvas->ClipRect(gfx::Rect(dst_x, dst_y, icon_width, icon_height));
-  canvas->DrawImageInt(image,
-                       image_offset, 0, icon_width, icon_height,
-                       dst_x, dst_y, icon_width, icon_height,
-                       filter);
+  canvas->DrawBitmapInt(image,
+                        image_offset, 0, icon_width, icon_height,
+                        dst_x, dst_y, icon_width, icon_height,
+                        filter);
   canvas->Restore();
 }
 
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 4322314..4e0cfd1 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -551,15 +551,15 @@ void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
       hover_canvas.ExtractBitmap(), background_image);
 
   // Draw the tab background to the canvas.
-  canvas->DrawImageInt(background_image, 0, 0);
+  canvas->DrawBitmapInt(background_image, 0, 0);
 
   // And then the gradient on top of that.
   if (mini_title_animation_->current_part_index() == 2) {
     canvas->SaveLayerAlpha(mini_title_animation_->CurrentValueBetween(255, 0));
-    canvas->DrawImageInt(hover_image, 0, 0);
+    canvas->DrawBitmapInt(hover_image, 0, 0);
     canvas->Restore();
   } else {
-    canvas->DrawImageInt(hover_image, 0, 0);
+    canvas->DrawBitmapInt(hover_image, 0, 0);
   }
 }
 
@@ -600,7 +600,7 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
       *tab_bg, offset, bg_offset_y, tab_image->l_width, height());
   gfx::ImageSkia theme_l =
       SkBitmapOperations::CreateMaskedBitmap(tab_l, *alpha->image_l);
-  background_canvas.DrawImageInt(theme_l,
+  background_canvas.DrawBitmapInt(theme_l,
       0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
       0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
       false);
@@ -611,7 +611,7 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
       tab_image->r_width, height());
   gfx::ImageSkia theme_r =
       SkBitmapOperations::CreateMaskedBitmap(tab_r, *alpha->image_r);
-  background_canvas.DrawImageInt(theme_r,
+  background_canvas.DrawBitmapInt(theme_r,
       0, 0, theme_r.width(), theme_r.height() - kToolbarOverlap,
       width() - theme_r.width(), 0, theme_r.width(),
       theme_r.height() - kToolbarOverlap, false);
@@ -627,7 +627,7 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
      width() - tab_image->l_width - tab_image->r_width,
      height() - drop_shadow_height() - kToolbarOverlap - tab_image->y_offset);
 
-  canvas->DrawImageInt(background_canvas.ExtractBitmap(), 0, 0);
+  canvas->DrawBitmapInt(background_canvas.ExtractBitmap(), 0, 0);
 
   if (!GetThemeProvider()->HasCustomImage(tab_id) &&
       hover_controller().ShouldDraw()) {
@@ -635,14 +635,14 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
   }
 
   // Now draw the highlights/shadows around the tab edge.
-  canvas->DrawImageInt(*tab_inactive_image->image_l, 0, 0);
+  canvas->DrawBitmapInt(*tab_inactive_image->image_l, 0, 0);
   canvas->TileImageInt(*tab_inactive_image->image_c,
                        tab_inactive_image->l_width, 0,
                        width() - tab_inactive_image->l_width -
                            tab_inactive_image->r_width,
                        height());
-  canvas->DrawImageInt(*tab_inactive_image->image_r,
-                       width() - tab_inactive_image->r_width, 0);
+  canvas->DrawBitmapInt(*tab_inactive_image->image_r,
+                        width() - tab_inactive_image->r_width, 0);
 }
 
 void Tab::PaintActiveTabBackground(gfx::Canvas* canvas) {
@@ -661,14 +661,14 @@ void Tab::PaintActiveTabBackground(gfx::Canvas* canvas) {
       *tab_bg, offset, 0, tab_image->l_width, height());
   gfx::ImageSkia theme_l =
       SkBitmapOperations::CreateMaskedBitmap(tab_l, *alpha->image_l);
-  canvas->DrawImageInt(theme_l, 0, 0);
+  canvas->DrawBitmapInt(theme_l, 0, 0);
 
   // Draw right edge.
   gfx::ImageSkia tab_r = SkBitmapOperations::CreateTiledBitmap(*tab_bg,
       offset + width() - tab_image->r_width, 0, tab_image->r_width, height());
   gfx::ImageSkia theme_r =
       SkBitmapOperations::CreateMaskedBitmap(tab_r, *alpha->image_r);
-  canvas->DrawImageInt(theme_r, width() - tab_image->r_width, 0);
+  canvas->DrawBitmapInt(theme_r, width() - tab_image->r_width, 0);
 
   // Draw center.  Instead of masking out the top portion we simply skip over it
   // by incrementing by GetDropShadowHeight(), since it's a simple rectangle.
@@ -681,10 +681,10 @@ void Tab::PaintActiveTabBackground(gfx::Canvas* canvas) {
      height() - drop_shadow_height() - tab_image->y_offset);
 
   // Now draw the highlights/shadows around the tab edge.
-  canvas->DrawImageInt(*tab_image->image_l, 0, 0);
+  canvas->DrawBitmapInt(*tab_image->image_l, 0, 0);
   canvas->TileImageInt(*tab_image->image_c, tab_image->l_width, 0,
       width() - tab_image->l_width - tab_image->r_width, height());
-  canvas->DrawImageInt(*tab_image->image_r, width() - tab_image->r_width, 0);
+  canvas->DrawBitmapInt(*tab_image->image_r, width() - tab_image->r_width, 0);
 }
 
 int Tab::IconCapacity() const {
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 779f0fa..dce441c 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -123,8 +123,8 @@ class DockView : public views::View {
       case DockInfo::LEFT_HALF:
         if (!rtl_ui)
           std::swap(x_of_active_tab, x_of_inactive_tab);
-        canvas->DrawImageInt(*high_icon, x_of_active_tab,
-                             (height() - high_icon->height()) / 2);
+        canvas->DrawBitmapInt(*high_icon, x_of_active_tab,
+                              (height() - high_icon->height()) / 2);
         if (type_ == DockInfo::LEFT_OF_WINDOW) {
           DrawImageWithAlpha(canvas, *high_icon, x_of_inactive_tab,
                              (height() - high_icon->height()) / 2);
@@ -136,8 +136,8 @@ class DockView : public views::View {
       case DockInfo::RIGHT_HALF:
         if (rtl_ui)
           std::swap(x_of_active_tab, x_of_inactive_tab);
-        canvas->DrawImageInt(*high_icon, x_of_active_tab,
-                             (height() - high_icon->height()) / 2);
+        canvas->DrawBitmapInt(*high_icon, x_of_active_tab,
+                              (height() - high_icon->height()) / 2);
         if (type_ == DockInfo::RIGHT_OF_WINDOW) {
          DrawImageWithAlpha(canvas, *high_icon, x_of_inactive_tab,
                            (height() - high_icon->height()) / 2);
@@ -145,21 +145,21 @@ class DockView : public views::View {
         break;
 
       case DockInfo::TOP_OF_WINDOW:
-        canvas->DrawImageInt(*wide_icon, (width() - wide_icon->width()) / 2,
-                             height() / 2 - high_icon->height());
+        canvas->DrawBitmapInt(*wide_icon, (width() - wide_icon->width()) / 2,
+                              height() / 2 - high_icon->height());
         break;
 
       case DockInfo::MAXIMIZE: {
         gfx::ImageSkia* max_icon = rb.GetImageSkiaNamed(IDR_DOCK_MAX);
-        canvas->DrawImageInt(*max_icon, (width() - max_icon->width()) / 2,
-                             (height() - max_icon->height()) / 2);
+        canvas->DrawBitmapInt(*max_icon, (width() - max_icon->width()) / 2,
+                              (height() - max_icon->height()) / 2);
         break;
       }
 
       case DockInfo::BOTTOM_HALF:
       case DockInfo::BOTTOM_OF_WINDOW:
-        canvas->DrawImageInt(*wide_icon, (width() - wide_icon->width()) / 2,
-                             height() / 2 + kTabSpacing / 2);
+        canvas->DrawBitmapInt(*wide_icon, (width() - wide_icon->width()) / 2,
+                              height() / 2 + kTabSpacing / 2);
         if (type_ == DockInfo::BOTTOM_OF_WINDOW) {
           DrawImageWithAlpha(canvas, *wide_icon,
               (width() - wide_icon->width()) / 2,
@@ -179,7 +179,7 @@ class DockView : public views::View {
                           int x, int y) {
     SkPaint paint;
     paint.setAlpha(128);
-    canvas->DrawImageInt(image, x, y, paint);
+    canvas->DrawBitmapInt(image, x, y, paint);
   }
 
   DockInfo::Type type_;
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 951bd2e..610db93 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -354,7 +354,7 @@ void NewTabButton::OnMouseReleased(const views::MouseEvent& event) {
 
 void NewTabButton::OnPaint(gfx::Canvas* canvas) {
   SkBitmap image = GetBitmap();
-  canvas->DrawImageInt(image, 0, height() - image.height());
+  canvas->DrawBitmapInt(image, 0, height() - image.height());
 }
 
 bool NewTabButton::ShouldUseNativeFrame() const {
@@ -423,14 +423,14 @@ SkBitmap NewTabButton::GetBitmapForState(
   gfx::ImageSkia* overlay = GetThemeProvider()->GetImageSkiaNamed(overlay_id);
 
   gfx::Canvas canvas(gfx::Size(overlay->width(), overlay->height()), false);
-  canvas.DrawImageInt(GetBackgroundBitmap(state), 0, 0);
+  canvas.DrawBitmapInt(GetBackgroundBitmap(state), 0, 0);
 
   // Draw the button border with a slight alpha.
   const int kNativeFrameOverlayAlpha = 178;
   const int kOpaqueFrameOverlayAlpha = 230;
   canvas.SaveLayerAlpha(ShouldUseNativeFrame() ?
       kNativeFrameOverlayAlpha : kOpaqueFrameOverlayAlpha);
-  canvas.DrawImageInt(*overlay, 0, 0);
+  canvas.DrawBitmapInt(*overlay, 0, 0);
   canvas.Restore();
 
   return canvas.ExtractBitmap();
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 2f12389..b53dab9 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -330,7 +330,7 @@ gfx::ImageSkia ToolbarView::GetAppMenuIcon(
     NOTREACHED();
   }
 
-  canvas->DrawImageInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
+  canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
 
   return canvas->ExtractBitmap();
 }
@@ -655,9 +655,9 @@ void ToolbarView::OnPaint(gfx::Canvas* canvas) {
   // when they're flush against the edge of the screen they just look glitchy.
   if (!browser_->window() || !browser_->window()->IsMaximized()) {
     int top_spacing = PopupTopSpacing();
-    canvas->DrawImageInt(*kPopupBackgroundEdge, 0, top_spacing);
-    canvas->DrawImageInt(*kPopupBackgroundEdge,
-                         width() - kPopupBackgroundEdge->width(), top_spacing);
+    canvas->DrawBitmapInt(*kPopupBackgroundEdge, 0, top_spacing);
+    canvas->DrawBitmapInt(*kPopupBackgroundEdge,
+                          width() - kPopupBackgroundEdge->width(), top_spacing);
   }
 
   // For glass, we need to draw a black line below the location bar to separate
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
index a43d6b8..df4118a 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
@@ -59,7 +59,7 @@ SkBitmap GetGAIAPictureForNTP(const gfx::Image& image) {
       skia::ImageOperations::RESIZE_BEST, kLength, kLength);
 
   gfx::Canvas canvas(gfx::Size(kLength, kLength), false);
-  canvas.DrawImageInt(bmp, 0, 0);
+  canvas.DrawBitmapInt(bmp, 0, 0);
 
   // Draw a gray border on the inside of the icon.
   SkColor color = SkColorSetARGB(83, 0, 0, 0);