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

media/video/mft_h264_decode_engine.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.
 //
 // MFT H.264 decode engine.
 
 #ifndef MEDIA_VIDEO_MFT_H264_DECODE_ENGINE_H_
 #define MEDIA_VIDEO_MFT_H264_DECODE_ENGINE_H_
 
 // TODO(imcheng): Get rid of this header by:
 // - forward declaring IMFTransform and its IID as in
 //   mft_h264_decode_engine_context.h
 // - turning the general SendMFTMessage method into specific methods
 //   (SendFlushMessage, SendDrainMessage, etc.) to avoid having
 //   MFT_MESSAGE_TYPE in here
 #include <mfidl.h>
 #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;
 extern "C" const GUID IID_IDirect3DSurface9;
 
 class MessageLoop;
 
 namespace media {
 
 class VideoDecodeContext;
@@ skipping 39 matching lines @@
   void AllocFramesFromContext();
   bool CheckDecodeEngineDxvaSupport();
   bool SetDecodeEngineMediaTypes();
   bool SetDecodeEngineInputMediaType();
   bool SetDecodeEngineOutputMediaType(const GUID subtype);
   bool SendMFTMessage(MFT_MESSAGE_TYPE msg);
   bool GetStreamsInfoAndBufferReqs();
   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_;
 
   State state_;
 
   int width_;
   int height_;
 
   VideoDecodeEngine::EventHandler* event_handler_;
   VideoCodecInfo info_;
 
   VideoDecodeContext* context_;
   std::vector<scoped_refptr<VideoFrame> > output_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(MftH264DecodeEngine);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_MFT_H264_DECODE_ENGINE_H_