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

chrome/browser/history/history_publisher.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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #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
 
 class GURL;
 
 namespace base {
 class Time;
 }
 
 namespace history {
@@ skipping 30 matching lines @@
 
 #if defined(OS_WIN)
   // Initializes the indexer_list_ with the list of indexers that registered
   // with us to index history. Returns true if there are any registered.
   bool ReadRegisteredIndexersFromRegistry();
 
   // Converts time represented by the Time class object to variant time in UTC.
   // 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_;
 
   // The Registry key under HKCU where the indexers need to register their
   // CLSID.
   static const wchar_t* const kRegKeyRegisteredIndexersInfo;
 #endif
 
   // The format of the thumbnail we pass to indexers.
   static const char* const kThumbnailImageFormat;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryPublisher);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_