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

ui/gfx/canvas_direct2d_unittest.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 <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "base/command_line.h"
@@ skipping 81 matching lines @@
     ATOM atom = RegisterClassEx(&class_ex);
     DCHECK(atom);
   }
 
   void UnregisterMyClass() {
     ::UnregisterClass(kWindowClassName, NULL);
   }
 
   HWND hwnd_;
 
-  ScopedComPtr<ID2D1RenderTarget> rt_;
+  base::win::ScopedComPtr<ID2D1RenderTarget> rt_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindow);
 };
 
 // Loads a png data blob from the data resources associated with this
 // executable, decodes it and returns a SkBitmap.
 SkBitmap LoadBitmapFromResources(int resource_id) {
   SkBitmap bitmap;
 
   HINSTANCE resource_instance = GetModuleHandle(NULL);
@@ skipping 210 matching lines @@
     return;
   TestWindow window;
   gfx::CanvasDirect2D canvas(window.rt());
 
   SkBitmap bitmap = LoadBitmapFromResources(IDR_BITMAP_BRUSH_IMAGE);
 
   canvas.Save();
   canvas.TileImageInt(bitmap, 10, 10, 300, 300);
   canvas.Restore();
 }