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

chrome/browser/autofill/address.cc

 // Copyright (c) 2011 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/address.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_type.h"
@@ skipping 11 matching lines @@
   AutofillType::ADDRESS_ZIP,
   AutofillType::ADDRESS_COUNTRY,
 };
 
 const int kAutoFillAddressLength = arraysize(kAutoFillAddressTypes);
 
 }  // namespace
 
 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,
                                     FieldTypeSet* possible_types) const {
   DCHECK(possible_types);
 
   // If the text to match against the field types is empty, then no results will
   // match.
   if (text.empty())
     return;
@@ skipping 101 matching lines @@
   line1_tokens_.clear();
   line1_.clear();
   line2_tokens_.clear();
   line2_.clear();
   city_.clear();
   state_.clear();
   country_code_.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();
 
   std::string app_locale = AutofillCountry::ApplicationLocale();
   return AutofillCountry(country_code(), app_locale).name();
 }
 
 void Address::set_line1(const string16& line1) {
   line1_ = line1;
@@ skipping 102 matching lines @@
 bool Address::IsWordInLine(const string16& word,
                            const LineTokens& line_tokens) const {
   LineTokens::const_iterator iter;
   for (iter = line_tokens.begin(); iter != line_tokens.end(); ++iter) {
     if (StringToLowerASCII(word) == *iter)
       return true;
   }
 
   return false;
 }