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

chrome/browser/autofill/address.cc

Index: chrome/browser/autofill/address.cc
diff --git a/chrome/browser/autofill/address.cc b/chrome/browser/autofill/address.cc
index 59d1b1ea90c5fa769585f700ae4b4d17fa066864..183b5e179102caf910b62aea3dab7a365dfb4a20 100644
--- a/chrome/browser/autofill/address.cc
+++ b/chrome/browser/autofill/address.cc
@@ -29,10 +29,25 @@ const int kAutoFillAddressLength = arraysize(kAutoFillAddressTypes);
 
 Address::Address() {}
 
+Address::Address(const Address& address) : FormGroup() {
+  *this = address;
+}
+
 Address::~Address() {}
 
-FormGroup* Address::Clone() const {
-  return new Address(*this);
+Address& Address::operator=(const Address& address) {
+  if (this == &address)
+    return *this;
+
+  line1_tokens_ = address.line1_tokens_;
+  line2_tokens_= address.line2_tokens_;
+  line1_ = address.line1_;
+  line2_ = address.line2_;
+  city_ = address.city_;
+  state_ = address.state_;
+  country_code_ = address.country_code_;
+  zip_code_ = address.zip_code_;
+  return *this;
 }
 
 void Address::GetPossibleFieldTypes(const string16& text,
@@ -154,18 +169,6 @@ void Address::Clear() {
   zip_code_.clear();
 }
 
-Address::Address(const Address& address)
-    : FormGroup(),
-      line1_tokens_(address.line1_tokens_),
-      line2_tokens_(address.line2_tokens_),
-      line1_(address.line1_),
-      line2_(address.line2_),
-      city_(address.city_),
-      state_(address.state_),
-      country_code_(address.country_code_),
-      zip_code_(address.zip_code_) {
-}
-
 string16 Address::Country() const {
   if (country_code().empty())
     return string16();