Autofill extend profiles to include multi-valued fields, part 2.

No functional change.  This partitions the |ContactInfo| class into separate name, email, and company parts.  AutoFillProfile is changed to store its component members directly instead of in a map (in preparation for multiple values).  And the |Clone| operation is deprecated from the |FormGroup| class on down through the inheritance tree.

BUG=65625
TEST=All existing unit tests.

Review URL: http://codereview.chromium.org/6650014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77425 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 8 deletions

diff --git a/chrome/browser/autofill/phone_number.cc b/chrome/browser/autofill/phone_number.cc
index 2b8a0cc..110616a 100644
--- a/chrome/browser/autofill/phone_number.cc
+++ b/chrome/browser/autofill/phone_number.cc
@@ -34,8 +34,22 @@ const int kAutoFillPhoneLength = arraysize(kAutoFillPhoneTypes);
 
 PhoneNumber::PhoneNumber() {}
 
+PhoneNumber::PhoneNumber(const PhoneNumber& number) : FormGroup() {
+  *this = number;
+}
+
 PhoneNumber::~PhoneNumber() {}
 
+PhoneNumber& PhoneNumber::operator=(const PhoneNumber& number) {
+  if (this == &number)
+    return *this;
+  country_code_ = number.country_code_;
+  city_code_ = number.city_code_;
+  number_ = number.number_;
+  extension_ = number.extension_;
+  return *this;
+}
+
 void PhoneNumber::GetPossibleFieldTypes(const string16& text,
                                         FieldTypeSet* possible_types) const {
   string16 stripped_text(text);
@@ -212,14 +226,6 @@ void PhoneNumber::set_whole_number(const string16& whole_number) {
   set_country_code(country_code);
 }
 
-PhoneNumber::PhoneNumber(const PhoneNumber& phone_number)
-    : FormGroup(),
-      country_code_(phone_number.country_code_),
-      city_code_(phone_number.city_code_),
-      number_(phone_number.number_),
-      extension_(phone_number.extension_) {
-}
-
 bool PhoneNumber::FindInfoMatchesHelper(const FieldTypeSubGroup& subgroup,
                                         const string16& info,
                                         string16* match) const {