Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

ui/gfx/canvas_direct2d.h

 // 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.
 
 #ifndef UI_GFX_CANVAS_DIRECT2D_H_
 #define UI_GFX_CANVAS_DIRECT2D_H_
 #pragma once
 
 #include <d2d1.h>
 
 #include <stack>
 
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "ui/gfx/canvas.h"
 
 namespace gfx {
 
 class CanvasDirect2D : public Canvas {
  public:
   // Creates an empty Canvas.
   explicit CanvasDirect2D(ID2D1RenderTarget* rt);
   virtual ~CanvasDirect2D();
 
@@ skipping 55 matching lines @@
   virtual void EndPlatformPaint();
   virtual void Transform(const ui::Transform& transform);
   virtual ui::TextureID GetTextureID();
   virtual CanvasSkia* AsCanvasSkia();
   virtual const CanvasSkia* AsCanvasSkia() const;
 
  private:
   void SaveInternal(ID2D1Layer* layer);
 
   ID2D1RenderTarget* rt_;
-  ScopedComPtr<ID2D1GdiInteropRenderTarget> interop_rt_;
-  ScopedComPtr<ID2D1DrawingStateBlock> drawing_state_block_;
+  base::win::ScopedComPtr<ID2D1GdiInteropRenderTarget> interop_rt_;
+  base::win::ScopedComPtr<ID2D1DrawingStateBlock> drawing_state_block_;
   static ID2D1Factory* d2d1_factory_;
 
   // Every time Save* is called, a RenderState object is pushed onto the
   // RenderState stack.
   struct RenderState {
     explicit RenderState(ID2D1Layer* layer) : layer(layer), clip_count(0) {}
     RenderState() : layer(NULL), clip_count(0) {}
 
     // A D2D layer associated with this state, or NULL if there is no layer.
     // The layer is created and owned by the Canvas.
     ID2D1Layer* layer;
     // The number of clip operations performed. This is used to balance calls to
     // PushAxisAlignedClip with calls to PopAxisAlignedClip when Restore() is
     // called.
     int clip_count;
   };
   std::stack<RenderState> state_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D);
 };
 
 }  // namespace gfx;
 
 #endif  // UI_GFX_CANVAS_DIRECT2D_H_