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, 3 insertions, 6 deletions

diff --git a/chrome/browser/autofill/phone_number.h b/chrome/browser/autofill/phone_number.h
index 23fcb69..3c08b9b 100644
--- a/chrome/browser/autofill/phone_number.h
+++ b/chrome/browser/autofill/phone_number.h
@@ -16,10 +16,12 @@
 class PhoneNumber : public FormGroup {
  public:
   PhoneNumber();
+  explicit PhoneNumber(const PhoneNumber& number);
   virtual ~PhoneNumber();
 
+  PhoneNumber& operator=(const PhoneNumber& number);
+
   // FormGroup implementation:
-  virtual FormGroup* Clone() const = 0;
   virtual void GetPossibleFieldTypes(const string16& text,
                                      FieldTypeSet* possible_types) const;
   virtual void GetAvailableFieldTypes(FieldTypeSet* available_types) const;
@@ -53,14 +55,9 @@ class PhoneNumber : public FormGroup {
   virtual AutofillFieldType GetCityAndNumberType() const = 0;
   virtual AutofillFieldType GetWholeNumberType() const = 0;
 
- protected:
-  explicit PhoneNumber(const PhoneNumber& phone_number);
-
  private:
   FRIEND_TEST_ALL_PREFIXES(PhoneNumberTest, Matcher);
 
-  void operator=(const PhoneNumber& phone_number);
-
   const string16& country_code() const { return country_code_; }
   const string16& city_code() const { return city_code_; }
   const string16& number() const { return number_; }