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

chrome/browser/autofill/autofill_ie_toolbar_import_win.cc

 // Copyright (c) 2010 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/autofill/autofill_ie_toolbar_import_win.h"
 
 #include "base/basictypes.h"
-#include "base/registry.h"
 #include "base/string16.h"
+#include "base/win/registry.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/sync/util/data_encryption.h"
 
+using base::win::RegKey;
+
 // Forward declaration. This function is not in unnamed namespace as it
 // is referenced in the unittest.
 bool ImportCurrentUserProfiles(std::vector<AutoFillProfile>* profiles,
                                std::vector<CreditCard>* credit_cards);
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/autofill/internal/autofill_ie_toolbar_decryption.h"
 #else  // defined(GOOGLE_CHROME_BUILD)
 inline std::wstring DecryptCCNumber(const std::wstring& data) {
@@ skipping 144 matching lines @@
   DCHECK(profiles);
   DCHECK(credit_cards);
 
   // Create a map of possible fields for a quick access.
   RegToFieldMap reg_to_field;
   for (size_t i = 0; i < arraysize(profile_reg_values); ++i) {
     reg_to_field[std::wstring(profile_reg_values[i].reg_value_name)] =
         profile_reg_values[i].field_type;
   }
 
-  RegistryKeyIterator iterator_profiles(HKEY_CURRENT_USER, kProfileKey);
+  base::win::RegistryKeyIterator iterator_profiles(HKEY_CURRENT_USER,
+                                                   kProfileKey);
   for (; iterator_profiles.Valid(); ++iterator_profiles) {
     std::wstring key_name(kProfileKey);
     key_name.append(L"\\");
     key_name.append(iterator_profiles.Name());
     RegKey key(HKEY_CURRENT_USER, key_name.c_str(), KEY_READ);
     AutoFillProfile profile;
     if (ImportSingleProfile(&profile, &key, reg_to_field)) {
       // Combine phones into whole phone #.
       string16 phone;
       phone = profile.GetFieldText(AutoFillType(PHONE_HOME_COUNTRY_CODE));
@@ skipping 10 matching lines @@
   string16 password_hash;
   string16 salt;
   RegKey cc_key(HKEY_CURRENT_USER, kCreditCardKey, KEY_READ);
   if (cc_key.Valid()) {
     password_hash = ReadAndDecryptValue(&cc_key, kPasswordHashValue);
     salt = ReadAndDecryptValue(&cc_key, kSaltValue);
   }
 
   // We import CC profiles only if they are not password protected.
   if (password_hash.empty() && IsEmptySalt(salt)) {
-    RegistryKeyIterator iterator_cc(HKEY_CURRENT_USER, kCreditCardKey);
+    base::win::RegistryKeyIterator iterator_cc(HKEY_CURRENT_USER,
+                                               kCreditCardKey);
     for (; iterator_cc.Valid(); ++iterator_cc) {
       std::wstring key_name(kCreditCardKey);
       key_name.append(L"\\");
       key_name.append(iterator_cc.Name());
       RegKey key(HKEY_CURRENT_USER, key_name.c_str(), KEY_READ);
       CreditCard credit_card;
       if (ImportSingleProfile(&credit_card, &key, reg_to_field)) {
         string16 cc_number = credit_card.GetFieldText(
             AutoFillType(CREDIT_CARD_NUMBER));
 
         if (!cc_number.empty()) {
           // No additional password, and CC# is not empty, decrypt CC#.
           cc_number = DecryptCCNumber(cc_number);
         }
         credit_card.SetInfo(AutoFillType(CREDIT_CARD_NUMBER), cc_number);
         if (!cc_number.empty())
           credit_cards->push_back(credit_card);
       }
     }
   }
   return (profiles->size() + credit_cards->size()) > 0;
 }
 
 bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   AutoFillImporter *importer = new AutoFillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }