[Autofill] Rename GetInfo and SetInfo to GetRawInfo and SetRawInfo

chrome/browser/autofill/autofill_ie_toolbar_import_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/browser/autofill/autofill_ie_toolbar_import_win.h"
 
 #include <stddef.h>
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 132 matching lines @@
     if (it == reg_to_field.end())
       continue;  // This field is not imported.
     string16 field_value = ReadAndDecryptValue(key, value_name.c_str());
     if (!field_value.empty()) {
       has_non_empty_fields = true;
       if (it->second == CREDIT_CARD_NUMBER)
         field_value = DecryptCCNumber(field_value);
 
       // We need to store phone data in |phone| before building the whole number
       // at the end. The rest of the fields are set "as is".
+      // TODO(isherman): Call SetCanonicalizedInfo(), rather than SetRawInfo().
       if (!phone.SetInfo(it->second, field_value))
-        profile->SetInfo(it->second, field_value);
+        profile->SetRawInfo(it->second, field_value);
     }
   }
   // Now re-construct the phones if needed.
   string16 constructed_number;
   if (!phone.IsEmpty() &&
       phone.ParseNumber(std::string("US"), &constructed_number)) {
     profile->SetCanonicalizedInfo(PHONE_HOME_WHOLE_NUMBER, constructed_number);
   }
 
   return has_non_empty_fields;
@@ skipping 83 matching lines @@
   if (password_hash.empty() && IsEmptySalt(salt)) {
     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.GetInfo(CREDIT_CARD_NUMBER);
+        // TODO(isherman): Call into GetCanonicalizedInfo() below, rather than
+        // GetRawInfo().
+        string16 cc_number = credit_card.GetRawInfo(CREDIT_CARD_NUMBER);
         if (!cc_number.empty())
           credit_cards->push_back(credit_card);
       }
     }
   }
   return (profiles->size() + credit_cards->size()) > 0;
 }
 
 bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   // In incognito mode we do not have PDM - and we should not import anything.
   if (!pdm)
     return false;
   AutofillImporter *importer = new AutofillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }
-