Clean up AutoFillProfile::CreateInferredLabels()

chrome/browser/autofill/autofill_profile.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_profile.h"
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
@@ skipping 349 matching lines @@
         }
 
         string16 new_label;
         if (field_it < fields.size() && fields.size() > minimal_fields_shown) {
           std::vector<AutoFillFieldType> unique_fields;
           unique_fields.resize(fields.size());
           std::copy(fields.begin(), fields.end(), unique_fields.begin());
           unique_fields.resize(std::max(field_it + 1, minimal_fields_shown));
           new_label =
               profiles->at(*similar_profiles)->ConstructInferredLabel(
-                  &unique_fields);
+                  unique_fields);
         } else {
           new_label =
-              profiles->at(*similar_profiles)->ConstructInferredLabel(&fields);
+              profiles->at(*similar_profiles)->ConstructInferredLabel(fields);
         }
         (*created_labels)[*similar_profiles] = new_label;
       }
     } else {
       std::vector<AutoFillFieldType> non_empty_fields;
       size_t include_fields = minimal_fields_shown ? minimal_fields_shown : 1;
       non_empty_fields.reserve(include_fields);
       for (size_t i = 0; i < fields_to_use.size(); ++i) {
         if (!profiles->at(label_iterator->second.front())->GetFieldText(
             AutoFillType(fields_to_use[i])).empty()) {
           non_empty_fields.push_back(fields_to_use[i]);
           if (non_empty_fields.size() >= include_fields)
             break;
         }
       }
 
       (*created_labels)[label_iterator->second.front()] =
           profiles->at(label_iterator->second.front())->ConstructInferredLabel(
-              &non_empty_fields);
+              non_empty_fields);
     }
   }
 }
 
 bool AutoFillProfile::IsEmpty() const {
   FieldTypeSet types;
   GetAvailableFieldTypes(&types);
   return types.empty();
 }
 
@@ skipping 59 matching lines @@
          GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)) +
          GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)) +
          GetFieldText(AutoFillType(EMAIL_ADDRESS));
 }
 
 Address* AutoFillProfile::GetHomeAddress() {
   return static_cast<Address*>(personal_info_[AutoFillType::ADDRESS_HOME]);
 }
 
 string16 AutoFillProfile::ConstructInferredLabel(
-    const std::vector<AutoFillFieldType>* included_fields) const {
-  DCHECK(included_fields);
+    const std::vector<AutoFillFieldType>& included_fields) const {
+  const string16 separator =
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_SEPARATOR);
+
   string16 label;
-  string16 separator = l10n_util::GetStringUTF16(
-                       IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_SEPARATOR);
   for (std::vector<AutoFillFieldType>::const_iterator it =
-       included_fields->begin(); it != included_fields->end(); ++it) {
+           included_fields.begin();
+       it != included_fields.end(); ++it) {
     string16 field = GetFieldText(AutoFillType(*it));
-    if (!field.empty()) {
-      if (!label.empty()) {
-        label.append(separator);
-      }
-      // Fax number has special format, to indicate that this is a fax number.
-      if (*it == PHONE_FAX_WHOLE_NUMBER) {
-        field = l10n_util::GetStringFUTF16(
-            IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_FAX_FORMAT, field);
-      }
-      label.append(field);
+    if (field.empty())
+      continue;
+
+    if (!label.empty())
+      label.append(separator);
+
+    // Fax number has special format, to indicate that this is a fax number.
+    if (*it == PHONE_FAX_WHOLE_NUMBER) {
+      field = l10n_util::GetStringFUTF16(
+          IDS_AUTOFILL_DIALOG_ADDRESS_SUMMARY_FAX_FORMAT, field);
     }
+    label.append(field);
   }
   return label;
 }
 
 // So we can compare AutoFillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutoFillProfile& profile) {
   return os
       << UTF16ToUTF8(profile.Label())
       << " "
       << profile.guid()
@@ skipping 19 matching lines @@
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(
              PHONE_HOME_WHOLE_NUMBER)))
       << " "
       << UTF16ToUTF8(profile.GetFieldText(AutoFillType(
              PHONE_FAX_WHOLE_NUMBER)));
 }