Revert 50784 - Canvas refactoring part 3....

views/controls/menu/menu_separator_win.cc

Index: views/controls/menu/menu_separator_win.cc
===================================================================
--- views/controls/menu/menu_separator_win.cc	(revision 50789)
+++ views/controls/menu/menu_separator_win.cc	(working copy)
@@ -8,7 +8,7 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_item_view.h"
@@ -20,7 +20,7 @@
   // The gutter is rendered before the background.
   int start_x = 0;
   int start_y = height() / 3;
-  HDC dc = canvas->AsCanvasSkia()->beginPlatformPaint();
+  HDC dc = canvas->beginPlatformPaint();
   if (config.render_gutter) {
     // If render_gutter is true, we're on Vista and need to render the
     // gutter, then indent the separator from the gutter.
@@ -36,7 +36,7 @@
   RECT separator_bounds = { start_x, start_y, width(), height() };
   gfx::NativeTheme::instance()->PaintMenuSeparator(
       dc, MENU_POPUPSEPARATOR, MPI_NORMAL, &separator_bounds);
-  canvas->AsCanvasSkia()->endPlatformPaint();
+  canvas->endPlatformPaint();
 }
 
 gfx::Size MenuSeparator::GetPreferredSize() {