Move pe_image and registry from base to base/win and use the namespace. It re...

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_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/registry.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,
     std::vector< ScopedComPtr<IChromeHistoryIndexer> >* indexers) {
   IChromeHistoryIndexer* indexer;
-  RegistryKeyIterator r_iter(root, path);
+  base::win::RegistryKeyIterator r_iter(root, path);
   while (r_iter.Valid()) {
     if (CoCreateIndexerFromName(r_iter.Name(), &indexer)) {
       indexers->push_back(ScopedComPtr<IChromeHistoryIndexer>(indexer));
       indexer->Release();
     }
     ++r_iter;
   }
 }
 
 }  // namespace
@@ skipping 78 matching lines @@
                                                 const base::Time& end_time)
     const {
   ScopedVariant var_begin_time(TimeToUTCVariantTime(begin_time), VT_DATE);
   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