Removal of dependencies on PlatformDevice classes.

ui/gfx/native_theme_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/gfx/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 114 matching lines @@
   ReleaseDC(NULL, hdc);
 
   return SUCCEEDED(hr) ? Size(size.cx, size.cy) : Size();
 }
 
 void NativeThemeWin::Paint(SkCanvas* canvas,
                            Part part,
                            State state,
                            const gfx::Rect& rect,
                            const ExtraParams& extra) const {
-  HDC hdc = skia::BeginPlatformPaint(canvas);
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas);
+  HDC hdc = scoped_platform_paint.GetPlatformSurface();
 
   switch (part) {
     case kCheckbox:
       PaintCheckbox(hdc, part, state, rect, extra.button);
       break;
     case kRadio:
       PaintRadioButton(hdc, part, state, rect, extra.button);
       break;
     case kPushButton:
       PaintPushButton(hdc, part, state, rect, extra.button);
@@ skipping 59 matching lines @@
       PaintTextField(hdc, part, state, rect, extra.text_field);
       break;
 
     case kSliderTrack:
     case kSliderThumb:
     default:
       // While transitioning NativeThemeWin to the single Paint() entry point,
       // unsupported parts will DCHECK here.
       DCHECK(false);
   }
-
-  skia::EndPlatformPaint(canvas);
 }
 
 HRESULT NativeThemeWin::PaintScrollbarArrow(
     HDC hdc,
     Part part,
     State state,
     const gfx::Rect& rect,
     const ScrollbarArrowExtraParams& extra) const {
   static int state_id_matrix[4][kMaxState] = {
       ABS_DOWNDISABLED, ABS_DOWNHOT, ABS_DOWNNORMAL, ABS_DOWNPRESSED,
@@ skipping 1280 matching lines @@
       }
       break;
     default:
       NOTREACHED() << "Invalid part: " << part;
       break;
   }
   return state_id;
 }
 
 }  // namespace gfx