Rename paint data structures

ui/native_theme/common_theme.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 "ui/native_theme/common_theme.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 311 matching lines @@
     case NativeTheme::kColorId_NumColors:
       break;
   }
 
   NOTREACHED();
   return gfx::kPlaceholderColor;
 }
 
 void CommonThemePaintMenuItemBackground(
     const NativeTheme* theme,
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     NativeTheme::State state,
     const gfx::Rect& rect,
     const NativeTheme::MenuItemExtraParams& menu_item) {
-  SkPaint paint;
+  cc::PaintFlags paint;
   switch (state) {
     case NativeTheme::kNormal:
     case NativeTheme::kDisabled:
       paint.setColor(
           theme->GetSystemColor(NativeTheme::kColorId_MenuBackgroundColor));
       break;
     case NativeTheme::kHovered:
       paint.setColor(theme->GetSystemColor(
           NativeTheme::kColorId_FocusedMenuItemBackgroundColor));
       break;
     default:
       NOTREACHED() << "Invalid state " << state;
       break;
   }
   if (menu_item.corner_radius > 0) {
     const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
     canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
     return;
   }
   canvas->drawRect(gfx::RectToSkRect(rect), paint);
 }
 
 }  // namespace ui