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

chrome/browser/history/history_publisher.h

Index: chrome/browser/history/history_publisher.h
diff --git a/chrome/browser/history/history_publisher.h b/chrome/browser/history/history_publisher.h
index f5ac086177ae848fe2e995d3b5cad298be99bce5..4718801ffa1e5337aee25a4d08bbfa6f7cd73a60 100644
--- a/chrome/browser/history/history_publisher.h
+++ b/chrome/browser/history/history_publisher.h
@@ -12,7 +12,7 @@
 #include "base/string16.h"
 
 #if defined(OS_WIN)
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "history_indexer.h"
 #endif
 
@@ -63,7 +63,8 @@ class HistoryPublisher {
   // Returns '0' if the time object is NULL.
   static double TimeToUTCVariantTime(const base::Time& time);
 
-  typedef std::vector< ScopedComPtr<IChromeHistoryIndexer> > IndexerList;
+  typedef std::vector< base::win::ScopedComPtr<
+      IChromeHistoryIndexer> > IndexerList;
 
   // The list of indexers registered to receive history data from us.
   IndexerList indexers_;