Remove even more ATL dependencies.

chrome/browser/history/history_publisher.h

 // Copyright (c) 2008 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_
 
 #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
 
 namespace history {
 
 class HistoryPublisher {
  public:
   HistoryPublisher();
   ~HistoryPublisher();
 
@@ skipping 24 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<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);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_PUBLISHER_H_