Remove even more ATL dependencies.

chrome/browser/history/history_publisher_win.cc

 // Copyright (c) 2008-2009 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.
 
 #include "chrome/browser/history/history_publisher.h"
 
 #include <atlsafe.h>
 #include <objbase.h>
 #include <oleauto.h>
 #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
 double HistoryPublisher::TimeToUTCVariantTime(const base::Time& time) {
   double var_time = 0;
   if (!time.is_null()) {
     base::Time::Exploded exploded;
     time.UTCExplode(&exploded);
 
     // Create the system time struct representing our exploded time.
@@ skipping 26 matching lines @@
 
 bool HistoryPublisher::ReadRegisteredIndexersFromRegistry() {
   RegistryKeyIterator iter(HKEY_CURRENT_USER, kRegKeyRegisteredIndexersInfo);
   while (iter.Valid()) {
     // The subkey name is the GUID of the Indexer COM object which implements
     // the IChromeHistoryIndexer interface. We shall store that and use it to
     // send historical data to the indexer.
     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));
     if (SUCCEEDED(hr) && indexer != NULL)
       indexers_.push_back(indexer);
     ++iter;
   }
   return indexers_.size() > 0;
 }
 
@@ skipping 24 matching lines @@
     const {
   double var_begin_time = TimeToUTCVariantTime(begin_time);
   double var_end_time = TimeToUTCVariantTime(end_time);
   for(size_t i = 0; i < indexers_.size(); ++i) {
     indexers_[i]->DeleteUserHistoryBetween(CComVariant(var_begin_time, VT_DATE),
                                            CComVariant(var_end_time, VT_DATE));
   }
 }
 
 }  // namespace history