AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/contact_info.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/contact_info.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
@@ skipping 10 matching lines @@
 
 static const size_t kAutoFillContactInfoLength =
     arraysize(kAutoFillContactInfoTypes);
 
 FormGroup* ContactInfo::Clone() const {
   return new ContactInfo(*this);
 }
 
 void ContactInfo::GetPossibleFieldTypes(const string16& text,
                                         FieldTypeSet* possible_types) const {
+  DCHECK(possible_types);
+
   if (IsFirstName(text))
     possible_types->insert(NAME_FIRST);
 
   if (IsMiddleName(text))
     possible_types->insert(NAME_MIDDLE);
 
   if (IsLastName(text))
     possible_types->insert(NAME_LAST);
 
   if (IsMiddleInitial(text))
     possible_types->insert(NAME_MIDDLE_INITIAL);
 
   if (IsSuffix(text))
     possible_types->insert(NAME_SUFFIX);
 
   if (IsFullName(text))
     possible_types->insert(NAME_FULL);
 
   if (email_ == text)
     possible_types->insert(EMAIL_ADDRESS);
 
   if (company_name_ == text)
     possible_types->insert(COMPANY_NAME);
 }
 
+void ContactInfo::GetAvailableFieldTypes(FieldTypeSet* available_types) const {
+  DCHECK(available_types);
+
+  if (!first().empty())
+    available_types->insert(NAME_FIRST);
+
+  if (!middle().empty())
+    available_types->insert(NAME_MIDDLE);
+
+  if (!last().empty())
+    available_types->insert(NAME_LAST);
+
+  if (!MiddleInitial().empty())
+    available_types->insert(NAME_MIDDLE_INITIAL);
+
+  if (!FullName().empty())
+    available_types->insert(NAME_FULL);
+
+  if (!suffix().empty())
+    available_types->insert(NAME_SUFFIX);
+
+  if (!email().empty())
+    available_types->insert(EMAIL_ADDRESS);
+
+  if (!company_name().empty())
+    available_types->insert(COMPANY_NAME);
+}
+
 void ContactInfo::FindInfoMatches(const AutoFillType& type,
                                   const string16& info,
                                   std::vector<string16>* matched_text) const {
-  if (matched_text == NULL) {
-    DLOG(ERROR) << "NULL matched vector passed in";
-    return;
-  }
+  DCHECK(matched_text);
 
   string16 match;
   if (type.field_type() == UNKNOWN_TYPE) {
     for (size_t i = 0; i < kAutoFillContactInfoLength; i++) {
       if (FindInfoMatchesHelper(kAutoFillContactInfoTypes[i], info, &match))
         matched_text->push_back(match);
     }
   } else if (FindInfoMatchesHelper(type.field_type(), info, &match)) {
       matched_text->push_back(match);
   }
@@ skipping 303 matching lines @@
       SetLast(full_name_tokens.back());
       if (full_name_tokens.size() > 2) {
         full_name_tokens.erase(full_name_tokens.begin());
         full_name_tokens.pop_back();
         SetMiddle(JoinString(full_name_tokens, ' '));
       }
     }
   }
 }