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

media/video/mft_h264_decode_engine.h

Index: media/video/mft_h264_decode_engine.h
diff --git a/media/video/mft_h264_decode_engine.h b/media/video/mft_h264_decode_engine.h
index 9ce79350e6d5c67b54dc4652f8c97891c159883c..9a2ca5d0d3bbd834e55aeb5a0411e394065d9b67 100644
--- a/media/video/mft_h264_decode_engine.h
+++ b/media/video/mft_h264_decode_engine.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "media/video/video_decode_engine.h"
 
 struct IDirect3DSurface9;
@@ -77,11 +77,12 @@ class MftH264DecodeEngine : public media::VideoDecodeEngine {
   bool DoDecode(const PipelineStatistics& statistics);
   void OnAllocFramesDone();
   void OnUploadVideoFrameDone(
-      ScopedComPtr<IDirect3DSurface9, &IID_IDirect3DSurface9> surface,
+      base::win::ScopedComPtr<IDirect3DSurface9,
+                              &IID_IDirect3DSurface9> surface,
       scoped_refptr<media::VideoFrame> frame, PipelineStatistics statistics);
 
   bool use_dxva_;
-  ScopedComPtr<IMFTransform> decode_engine_;
+  base::win::ScopedComPtr<IMFTransform> decode_engine_;
 
   MFT_INPUT_STREAM_INFO input_stream_info_;
   MFT_OUTPUT_STREAM_INFO output_stream_info_;