Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc

Index: chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc
===================================================================
--- chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc	(revision 50789)
+++ chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc	(working copy)
@@ -13,7 +13,7 @@
 #include "chrome/browser/views/extensions/browser_action_drag_data.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_2.h"
 
@@ -34,11 +34,11 @@
   size_t command_id = 1;  // Menu id 0 is reserved, start with 1.
   for (size_t i = start_index; i < views_->size(); ++i) {
     BrowserActionView* view = (*views_)[i];
-    scoped_ptr<gfx::Canvas> canvas(view->GetIconWithBadge());
+    scoped_ptr<gfx::CanvasSkia> canvas(view->GetIconWithBadge());
     menu_->AppendMenuItemWithIcon(
         command_id,
         UTF8ToWide(view->button()->extension()->name()),
-        canvas->AsCanvasSkia()->ExtractBitmap());
+        canvas->ExtractBitmap());
 
     // Set the tooltip for this item.
     std::wstring tooltip = UTF8ToWide(