[Autofill] Rename GetInfo and SetInfo to GetRawInfo and SetRawInfo

chrome/browser/webdata/autofill_profile_syncable_service.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/webdata/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 64 matching lines @@
   }
 
   if (DLOG_IS_ON(INFO)) {
     DVLOG(2) << "[AUTOFILL MIGRATION]"
              << "Printing profiles from web db";
 
     for (ScopedVector<AutofillProfile>::const_iterator ix =
          profiles_.begin(); ix != profiles_.end(); ++ix) {
       AutofillProfile* p = *ix;
       DVLOG(2) << "[AUTOFILL MIGRATION]  "
-               << p->GetInfo(NAME_FIRST)
-               << p->GetInfo(NAME_LAST)
+               << p->GetRawInfo(NAME_FIRST)
+               << p->GetRawInfo(NAME_LAST)
                << p->guid();
     }
   }
 
   sync_processor_ = sync_processor.Pass();
 
   GUIDToProfileMap remaining_profiles;
   CreateGUIDToProfileMap(profiles_.get(), &remaining_profiles);
 
   DataBundle bundle;
@@ skipping 17 matching lines @@
   for (GUIDToProfileMap::iterator it = bundle.candidates_to_merge.begin();
        it != bundle.candidates_to_merge.end(); ++it) {
     GUIDToProfileMap::iterator profile_to_merge =
         remaining_profiles.find(it->first);
     if (profile_to_merge != remaining_profiles.end()) {
       bundle.profiles_to_delete.push_back(profile_to_merge->second->guid());
       if (MergeProfile(*(profile_to_merge->second), it->second))
         bundle.profiles_to_sync_back.push_back(it->second);
       DVLOG(2) << "[AUTOFILL SYNC]"
                << "Found similar profile in sync db but with a different guid: "
-               << UTF16ToUTF8(it->second->GetInfo(NAME_FIRST))
-               << UTF16ToUTF8(it->second->GetInfo(NAME_LAST))
+               << UTF16ToUTF8(it->second->GetRawInfo(NAME_FIRST))
+               << UTF16ToUTF8(it->second->GetRawInfo(NAME_LAST))
                << "New guid " << it->second->guid()
                << ". Profile to be deleted "
                << profile_to_merge->second->guid();
       remaining_profiles.erase(profile_to_merge);
     }
   }
 
   if (!SaveChangesToWebData(bundle)) {
     return sync_error_factory_->CreateAndUploadError(
         FROM_HERE,
@@ skipping 194 matching lines @@
 
   specifics->set_guid(profile.guid());
   std::vector<string16> values;
   profile.GetMultiInfo(NAME_FIRST, &values);
   for (size_t i = 0; i < values.size(); ++i)
     specifics->add_name_first(LimitData(UTF16ToUTF8(values[i])));
   profile.GetMultiInfo(NAME_MIDDLE, &values);
   for (size_t i = 0; i < values.size(); ++i)
     specifics->add_name_middle(LimitData(UTF16ToUTF8(values[i])));
   profile.GetMultiInfo(NAME_LAST, &values);
   for (size_t i = 0; i < values.size(); ++i)

[Dan Beam, 2012/11/09 18:46:30]

nit: curlies, IMO, and/or at least a \n under these for loops as my eyes
originally thought there was an indent error

[Ilya Sherman, 2012/11/10 03:21:33]

Done.

     specifics->add_name_last(LimitData(UTF16ToUTF8(values[i])));
   specifics->set_address_home_line1(
-      LimitData(UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_LINE1))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE1))));
   specifics->set_address_home_line2(
-      LimitData(UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_LINE2))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_LINE2))));
   specifics->set_address_home_city(
-      LimitData(UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_CITY))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_CITY))));
   specifics->set_address_home_state(
-      LimitData(UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_STATE))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE))));
   specifics->set_address_home_country(
-      LimitData(UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_COUNTRY))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))));
   specifics->set_address_home_zip(
-      LimitData(UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_ZIP))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP))));
   profile.GetMultiInfo(EMAIL_ADDRESS, &values);
   for (size_t i = 0; i < values.size(); ++i)
     specifics->add_email_address(LimitData(UTF16ToUTF8(values[i])));
   specifics->set_company_name(
-      LimitData(UTF16ToUTF8(profile.GetInfo(COMPANY_NAME))));
+      LimitData(UTF16ToUTF8(profile.GetRawInfo(COMPANY_NAME))));
   profile.GetMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   for (size_t i = 0; i < values.size(); ++i)
     specifics->add_phone_home_whole_number(LimitData(UTF16ToUTF8(values[i])));
 }
 
 void AutofillProfileSyncableService::CreateGUIDToProfileMap(
     const std::vector<AutofillProfile*>& profiles,
     GUIDToProfileMap* profile_map) {
   DCHECK(profile_map);
   profile_map->clear();
@@ skipping 27 matching lines @@
         new AutofillProfile(autofill_specifics.guid()));
     OverwriteProfileWithServerData(autofill_specifics, new_profile);
 
     // Check if profile appears under a different guid.
     for (GUIDToProfileMap::iterator i = profile_map->begin();
          i != profile_map->end(); ++i) {
       if (i->second->Compare(*new_profile) == 0) {
         bundle->profiles_to_delete.push_back(i->second->guid());
         DVLOG(2) << "[AUTOFILL SYNC]"
                  << "Found in sync db but with a different guid: "
-                 << UTF16ToUTF8(i->second->GetInfo(NAME_FIRST))
-                 << UTF16ToUTF8(i->second->GetInfo(NAME_LAST))
+                 << UTF16ToUTF8(i->second->GetRawInfo(NAME_FIRST))
+                 << UTF16ToUTF8(i->second->GetRawInfo(NAME_LAST))
                  << "New guid " << new_profile->guid()
                  << ". Profile to be deleted " << i->second->guid();
         profile_map->erase(i);
         break;
       } else if (!i->second->PrimaryValue().empty() &&
                  i->second->PrimaryValue() == new_profile->PrimaryValue()) {
         // Add it to candidates for merge - if there is no profile with this
         // guid we will merge them.
         bundle->candidates_to_merge.insert(std::make_pair(i->second->guid(),
                                                           new_profile));
@@ skipping 66 matching lines @@
   WriteAutofillProfile(profile, &specifics);
   return
       syncer::SyncData::CreateLocalData(
           profile.guid(), profile.guid(), specifics);
 }
 
 bool AutofillProfileSyncableService::UpdateField(
     AutofillFieldType field_type,
     const std::string& new_value,
     AutofillProfile* autofill_profile) {
-  if (UTF16ToUTF8(autofill_profile->GetInfo(field_type)) == new_value)
+  if (UTF16ToUTF8(autofill_profile->GetRawInfo(field_type)) == new_value)
     return false;
-  autofill_profile->SetInfo(field_type, UTF8ToUTF16(new_value));
+  autofill_profile->SetRawInfo(field_type, UTF8ToUTF16(new_value));
   return true;
 }
 
 bool AutofillProfileSyncableService::UpdateMultivaluedField(
     AutofillFieldType field_type,
     const ::google::protobuf::RepeatedPtrField<std::string>& new_values,
     AutofillProfile* autofill_profile) {
   std::vector<string16> values;
   autofill_profile->GetMultiInfo(field_type, &values);
   bool changed = false;
@@ skipping 23 matching lines @@
 }
 
 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const {
   return web_data_service_->GetDatabase()->GetAutofillTable();
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {
 }