3 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/history/history_publisher.cc b/chrome/browser/history/history_publisher.cc
index 52327c5..364bb821 100644
--- a/chrome/browser/history/history_publisher.cc
+++ b/chrome/browser/history/history_publisher.cc
@@ -6,7 +6,7 @@
 
 namespace history {
 
-const char* HistoryPublisher::kThumbnailImageFormat = "image/jpeg";
+const char* const HistoryPublisher::kThumbnailImageFormat = "image/jpeg";
 
 void HistoryPublisher::PublishPageThumbnail(
     const std::vector<unsigned char>& thumbnail, const GURL& url,
diff --git a/chrome/browser/history/history_publisher.h b/chrome/browser/history/history_publisher.h
index 71005e5..e44a19e 100644
--- a/chrome/browser/history/history_publisher.h
+++ b/chrome/browser/history/history_publisher.h
@@ -8,14 +8,12 @@
 #include <vector>
 #include <string>
 
-#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 "base/scoped_comptr_win.h"
 #include "history_indexer.h"
 #endif
 
@@ -60,18 +58,18 @@ class HistoryPublisher {
   // Returns '0' if the time object is NULL.
   static double TimeToUTCVariantTime(const base::Time& time);
 
-  typedef std::vector<CComPtr<IChromeHistoryIndexer> > IndexerList;
+  typedef std::vector< 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* kRegKeyRegisteredIndexersInfo;
+  static const wchar_t* const kRegKeyRegisteredIndexersInfo;
 #endif
 
   // The format of the thumbnail we pass to indexers.
-  static const char* kThumbnailImageFormat;
+  static const char* const kThumbnailImageFormat;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryPublisher);
 };
diff --git a/chrome/browser/history/history_publisher_win.cc b/chrome/browser/history/history_publisher_win.cc
index 72c0f1d..ef4fb7f 100644
--- a/chrome/browser/history/history_publisher_win.cc
+++ b/chrome/browser/history/history_publisher_win.cc
@@ -10,10 +10,11 @@
 #include <wtypes.h>
 
 #include "base/registry.h"
+#include "base/scoped_comptr_win.h"
 
 namespace history {
 
-const wchar_t* HistoryPublisher::kRegKeyRegisteredIndexersInfo =
+const wchar_t* const HistoryPublisher::kRegKeyRegisteredIndexersInfo =
     L"Software\\Google\\Google Chrome\\IndexerPlugins";
 
 // static
@@ -60,7 +61,7 @@ bool HistoryPublisher::ReadRegisteredIndexersFromRegistry() {
     CLSID clsid;
     CLSIDFromString(static_cast<LPOLESTR>(
         const_cast<TCHAR*>(iter.Name())), &clsid);
-    CComPtr<IChromeHistoryIndexer> indexer;
+    ScopedComPtr<IChromeHistoryIndexer> indexer;
     HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC,
                                   __uuidof(IChromeHistoryIndexer),
                                   reinterpret_cast<void**>(&indexer));