Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/gtk/avatar_menu_item_gtk.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/gtk/avatar_menu_item_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 195 matching lines @@
     gfx::Canvas canvas(avatar_image_rep, /* is_opaque */ true);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const SkBitmap* check_image = rb.GetImageNamed(
         IDR_PROFILE_SELECTED).ToSkBitmap();
     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);
 
-    SkBitmap final_image = canvas.ExtractImageRep().sk_bitmap();
+    SkBitmap final_image = canvas.ExtractBitmap();
     avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(final_image);
   } else {
     avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(*item_.icon.ToSkBitmap());
   }
 
   GtkWidget* avatar_image = gtk_image_new_from_pixbuf(avatar_pixbuf);
   g_object_unref(avatar_pixbuf);
   gtk_misc_set_alignment(GTK_MISC(avatar_image), 0, 0);
   gtk_box_pack_start(GTK_BOX(item_hbox), avatar_image, FALSE, FALSE, 0);
 
@@ skipping 52 matching lines @@
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }