Revert 15965. I wasn't supposed to check that in since it still doesn't compile on linux and mac!

TBR=sky
Review URL: http://codereview.chromium.org/113351

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/history/history_publisher.h b/chrome/browser/history/history_publisher.h
index 00090659..71005e5 100644
--- a/chrome/browser/history/history_publisher.h
+++ b/chrome/browser/history/history_publisher.h
@@ -8,12 +8,14 @@
 #include <vector>
 #include <string>
 
-#include "base/scoped_comptr_win.h"
+#include "base/basictypes.h"
 #include "base/time.h"
 #include "chrome/browser/history/history_types.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN)
+#include <atlbase.h>
+#include <atlcomcli.h>
 #include "history_indexer.h"
 #endif
 
@@ -58,18 +60,18 @@ 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<CComPtr<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;
+  static const wchar_t* kRegKeyRegisteredIndexersInfo;
 #endif
 
   // The format of the thumbnail we pass to indexers.
-  static const char* const kThumbnailImageFormat;
+  static const char* kThumbnailImageFormat;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryPublisher);
 };