[Autofill] Split off AutofillDataModel as a subclass of FormData.

components/autofill/browser/autofill_profile.cc

 // Copyright (c) 2012 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 "components/autofill/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 205 matching lines @@
 {
   bool operator()(const base::string16& x, const base::string16& y) const {
     return
         x.size() == y.size() && StringToLowerASCII(x) == StringToLowerASCII(y);
   }
 };
 
 }  // namespace
 
 AutofillProfile::AutofillProfile(const std::string& guid)
-    : guid_(guid),
+    : AutofillDataModel(guid),
       name_(1),
       email_(1),
       home_number_(1, PhoneNumber(this)) {
 }
 
 AutofillProfile::AutofillProfile()
-    : guid_(base::GenerateGUID()),
+    : AutofillDataModel(base::GenerateGUID()),
       name_(1),
       email_(1),
       home_number_(1, PhoneNumber(this)) {
 }
 
 AutofillProfile::AutofillProfile(const AutofillProfile& profile)
-    : FormGroup() {
+    : AutofillDataModel(std::string()) {
   operator=(profile);
 }
 
 AutofillProfile::~AutofillProfile() {
 }
 
 AutofillProfile& AutofillProfile::operator=(const AutofillProfile& profile) {
   if (this == &profile)
     return *this;
 
+  set_guid(profile.guid());
+
   label_ = profile.label_;
-  guid_ = profile.guid_;
-
   name_ = profile.name_;
   email_ = profile.email_;
   company_ = profile.company_;
   home_number_ = profile.home_number_;
 
   for (size_t i = 0; i < home_number_.size(); ++i)
     home_number_[i].set_profile(this);
 
   address_ = profile.address_;
 
   return *this;
 }
 
-std::string AutofillProfile::GetGUID() const {
-  return guid();
-}
-
 void AutofillProfile::GetMatchingTypes(const base::string16& text,
                                        const std::string& app_locale,
                                        FieldTypeSet* matching_types) const {
   FormGroupList info = FormGroups();
   for (FormGroupList::const_iterator it = info.begin(); it != info.end(); ++it)
     (*it)->GetMatchingTypes(text, app_locale, matching_types);
 }
 
 base::string16 AutofillProfile::GetRawInfo(AutofillFieldType type) const {
   AutofillFieldType return_type = AutofillType::GetEquivalentFieldType(type);
@@ skipping 170 matching lines @@
       int comparison = values_a[j].compare(values_b[j]);
       if (comparison != 0)
         return comparison;
     }
   }
 
   return 0;
 }
 
 bool AutofillProfile::operator==(const AutofillProfile& profile) const {
-  return guid_ == profile.guid_ && Compare(profile) == 0;
+  return guid() == profile.guid() && Compare(profile) == 0;
 }
 
 bool AutofillProfile::operator!=(const AutofillProfile& profile) const {
   return !operator==(profile);
 }
 
 const base::string16 AutofillProfile::PrimaryValue() const {
   return GetRawInfo(ADDRESS_HOME_LINE1) + GetRawInfo(ADDRESS_HOME_CITY);
 }
 
@@ skipping 382 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill