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

chrome_frame/urlmon_upload_data_stream_unittest.cc

Index: chrome_frame/urlmon_upload_data_stream_unittest.cc
diff --git a/chrome_frame/urlmon_upload_data_stream_unittest.cc b/chrome_frame/urlmon_upload_data_stream_unittest.cc
index efa8f1b14e3c0832025663dec7736547f89d1a8a..8bab45a9d19aa1bf2c691c26926a65c9244aa8f3 100644
--- a/chrome_frame/urlmon_upload_data_stream_unittest.cc
+++ b/chrome_frame/urlmon_upload_data_stream_unittest.cc
@@ -5,7 +5,7 @@
 #include "gtest/gtest.h"
 
 #include "base/memory/ref_counted.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "chrome_frame/urlmon_upload_data_stream.h"
 
 TEST(UrlmonUploadDataStreamTest, TestBasicRead) {
@@ -20,7 +20,7 @@ TEST(UrlmonUploadDataStreamTest, TestBasicRead) {
   ASSERT_TRUE(SUCCEEDED(hr));
 
   upload_stream->Initialize(upload_data.get());
-  ScopedComPtr<IStream> upload_istream(upload_stream);
+  base::win::ScopedComPtr<IStream> upload_istream(upload_stream);
 
   char buffer[500];
   memset(buffer, 0, 500);
@@ -55,7 +55,7 @@ TEST(UrlmonUploadDataStreamTest, TestBigRead) {
   ASSERT_TRUE(SUCCEEDED(hr));
 
   upload_stream->Initialize(upload_data.get());
-  ScopedComPtr<IStream> upload_istream(upload_stream);
+  base::win::ScopedComPtr<IStream> upload_istream(upload_stream);
 
   char big_rcv_buffer[kBigBufferLength];
   int write_pos = 0;
@@ -89,7 +89,7 @@ TEST(UrlmonUploadDataStreamTest, TestStat) {
   ASSERT_TRUE(SUCCEEDED(hr));
 
   upload_stream->Initialize(upload_data.get());
-  ScopedComPtr<IStream> upload_istream(upload_stream);
+  base::win::ScopedComPtr<IStream> upload_istream(upload_stream);
 
   STATSTG statstg;
   hr = upload_stream->Stat(&statstg, STATFLAG_NONAME);
@@ -110,7 +110,7 @@ TEST(UrlmonUploadDataStreamTest, TestRepeatedRead) {
   ASSERT_TRUE(SUCCEEDED(hr));
 
   upload_stream->Initialize(upload_data.get());
-  ScopedComPtr<IStream> upload_istream(upload_stream);
+  base::win::ScopedComPtr<IStream> upload_istream(upload_stream);
 
   char buffer[500];
   memset(buffer, 0, 500);
@@ -145,7 +145,7 @@ TEST(UrlmonUploadDataStreamTest, TestZeroRead) {
   ASSERT_TRUE(SUCCEEDED(hr));
 
   upload_stream->Initialize(upload_data.get());
-  ScopedComPtr<IStream> upload_istream(upload_stream);
+  base::win::ScopedComPtr<IStream> upload_istream(upload_stream);
 
   char buffer[500];
   memset(buffer, 0, 500);