Miscellaneous tiny cleanups done while converting files to use ScopedCOMInitializer, pulled out sep…

chrome/browser/history/history_publisher_win.cc

 // 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.
 
 #include "chrome/browser/history/history_publisher.h"
 
 #include <atlsafe.h>
 #include <objbase.h>
 #include <oleauto.h>
 #include <wtypes.h>
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
-// Instantiates a IChromeHistoryIndexer COM object. Takes a COM class id
-// in |name| and returns the object in |indexer|. Returns false if the
-// operation fails.
-bool CoCreateIndexerFromName(const wchar_t* name,
-                             IChromeHistoryIndexer** indexer) {
-  CLSID clsid;
-  HRESULT hr = CLSIDFromString(const_cast<wchar_t*>(name), &clsid);
-  if (FAILED(hr))
-    return false;
-  hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC,
-                        __uuidof(IChromeHistoryIndexer),
-                        reinterpret_cast<void**>(indexer));
-  if (FAILED(hr))
-    return false;
-  return true;
-}
-
 // Instantiates the registered indexers from the registry |root| + |path| key
 // and adds them to the |indexers| list.
-void AddRegisteredIndexers(HKEY root, const wchar_t* path,
+void AddRegisteredIndexers(
+    HKEY root,
+    const wchar_t* path,
     std::vector< base::win::ScopedComPtr<IChromeHistoryIndexer> >* indexers) {
-  IChromeHistoryIndexer* indexer;
-  base::win::RegistryKeyIterator r_iter(root, path);
-  while (r_iter.Valid()) {
-    if (CoCreateIndexerFromName(r_iter.Name(), &indexer)) {
-      indexers->push_back(
-          base::win::ScopedComPtr<IChromeHistoryIndexer>(indexer));
-      indexer->Release();
+  for (base::win::RegistryKeyIterator r_iter(root, path); r_iter.Valid();
+       ++r_iter) {
+    CLSID clsid;
+    if (FAILED(CLSIDFromString(const_cast<wchar_t*>(r_iter.Name()), &clsid)))
+      continue;
+    base::win::ScopedComPtr<IChromeHistoryIndexer> indexer;
+    if (SUCCEEDED(indexer.CreateInstance(clsid, NULL, CLSCTX_INPROC))) {
+      indexers->push_back(indexer);
+      indexer.Release();
     }
-    ++r_iter;
   }
 }
 
 }  // namespace
 
 namespace history {
 
 const wchar_t* const HistoryPublisher::kRegKeyRegisteredIndexersInfo =
     L"Software\\Google\\Google Chrome\\IndexerPlugins";
 
@@ skipping 74 matching lines @@
   base::win::ScopedVariant var_begin_time(TimeToUTCVariantTime(begin_time),
                                           VT_DATE);
   base::win::ScopedVariant var_end_time(TimeToUTCVariantTime(end_time),
                                         VT_DATE);
   for (size_t i = 0; i < indexers_.size(); ++i) {
     indexers_[i]->DeleteUserHistoryBetween(var_begin_time, var_end_time);
   }
 }
 
 }  // namespace history