ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

ui/views/controls/menu/menu_separator_win.cc

 // Copyright (c) 2011 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 "ui/views/controls/menu/menu_separator.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/native_theme.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
 namespace views {
 
 void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
   const MenuConfig& config = MenuConfig::instance();
   // The gutter is rendered before the background.
@@ skipping 17 matching lines @@
   theme->Paint(canvas->GetSkCanvas(), gfx::NativeTheme::kMenuPopupSeparator,
                gfx::NativeTheme::kNormal, separator_bounds, extra);
 }
 
 gfx::Size MenuSeparator::GetPreferredSize() {
   return gfx::Size(10,  // Just in case we're the only item in a menu.
                    MenuConfig::instance().separator_height);
 }
 
 }  // namespace views