Allow Registry Iterator functions to use a specified WOW64 mode when iterating.

chrome/utility/importer/ie_importer_win.cc

 // Copyright (c) 2012 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/utility/importer/ie_importer_win.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
 #include <urlhist.h>
@@ skipping 207 matching lines @@
     std::vector<uint8> blob(blob_length);
     if (blob_length > 0 &&
         key.ReadValue(L"Order", reinterpret_cast<DWORD*>(&blob[0]),
                       &blob_length, NULL) == ERROR_SUCCESS) {
       if (!ParseFavoritesOrderBlob(importer, blob, path, sort_index))
         return false;
     }
   }
 
   // Recursively parse subfolders.
-  for (base::win::RegistryKeyIterator child(key.Handle(), L"");
+  for (base::win::RegistryKeyIterator child(key.Handle(), L"", 0);
        child.Valid() && !importer->cancelled();
        ++child) {
     base::win::RegKey subkey(key.Handle(), child.Name(), KEY_READ);
     if (subkey.Valid()) {
       base::FilePath subpath(path.Append(child.Name()));
       if (!ParseFavoritesOrderRegistryTree(importer, subkey, subpath,
                                            sort_index)) {
         return false;
       }
     }
@@ skipping 400 matching lines @@
         }
     }
 
     bridge_->SetPasswordForm(form);
   }
 }
 
 void IEImporter::ImportPasswordsIE7() {
   base::string16 key_path(importer::GetIE7PasswordsKey());
   base::win::RegKey key(HKEY_CURRENT_USER, key_path.c_str(), KEY_READ);
-  base::win::RegistryValueIterator reg_iterator(HKEY_CURRENT_USER,
-                                                key_path.c_str());
+  base::win::RegistryValueIterator reg_iterator(
+      HKEY_CURRENT_USER, key_path.c_str(), 0);
   importer::ImporterIE7PasswordInfo password_info;
   while (reg_iterator.Valid() && !cancelled()) {
     // Get the size of the encrypted data.
     DWORD value_len = 0;
     key.ReadValue(reg_iterator.Name(), NULL, &value_len, NULL);
     if (value_len) {
       // Query the encrypted data.
       password_info.encrypted_data.resize(value_len);
       if (key.ReadValue(reg_iterator.Name(),
                         &password_info.encrypted_data.front(),
                         &value_len, NULL) == ERROR_SUCCESS) {
         password_info.url_hash = reg_iterator.Name();
         password_info.date_created = base::Time::Now();
 
         bridge_->AddIE7PasswordInfo(password_info);
       }
     }
 
     ++reg_iterator;
   }
 }
 
 void IEImporter::ImportSearchEngines() {
   // On IE, search engines are stored in the registry, under:
   // Software\Microsoft\Internet Explorer\SearchScopes
   // Each key represents a search engine. The URL value contains the URL and
   // the DisplayName the name.
   typedef std::map<std::string, base::string16> SearchEnginesMap;
   SearchEnginesMap search_engines_map;
-  for (base::win::RegistryKeyIterator key_iter(HKEY_CURRENT_USER,
-       kSearchScopePath); key_iter.Valid(); ++key_iter) {
+  for (base::win::RegistryKeyIterator key_iter(
+           HKEY_CURRENT_USER, kSearchScopePath, 0);
+       key_iter.Valid();
+       ++key_iter) {
     base::string16 sub_key_name = kSearchScopePath;
     sub_key_name.append(L"\\").append(key_iter.Name());
     base::win::RegKey sub_key(HKEY_CURRENT_USER, sub_key_name.c_str(),
                               KEY_READ);
     base::string16 wide_url;
     if ((sub_key.ReadValue(L"URL", &wide_url) != ERROR_SUCCESS) ||
         wide_url.empty()) {
       VLOG(1) << "No URL for IE search engine at " << key_iter.Name();
       continue;
     }
@@ skipping 180 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }