| Index: chrome/utility/importer/ie_importer_win.cc
|
| diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
|
| index fbefb18b3a1555b82b4a7b0c881a126ffc35548d..c83cbfedba54761608fb93eca699781c32941aaf 100644
|
| --- a/chrome/utility/importer/ie_importer_win.cc
|
| +++ b/chrome/utility/importer/ie_importer_win.cc
|
| @@ -225,7 +225,7 @@ bool ParseFavoritesOrderRegistryTree(
|
| }
|
|
|
| // 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);
|
| @@ -646,8 +646,8 @@ void IEImporter::ImportPasswordsIE6() {
|
| 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.
|
| @@ -677,8 +677,10 @@ void IEImporter::ImportSearchEngines() {
|
| // 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(),
|
|
|