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

chrome/browser/autofill/android/personal_data_manager_android.cc

 // Copyright 2013 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/android/personal_data_manager_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 14 matching lines @@
 
 Profile* GetDefaultProfile() {
   return g_browser_process->profile_manager()->GetDefaultProfile();
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
     JNIEnv* env,
     const AutofillProfile& profile) {
   return Java_AutofillProfile_create(
       env,
-      ConvertUTF8ToJavaString(env, profile.GetGUID()).obj(),
+      ConvertUTF8ToJavaString(env, profile.guid()).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(NAME_FULL)).obj(),
       ConvertUTF16ToJavaString(env, profile.GetRawInfo(COMPANY_NAME)).obj(),
       ConvertUTF16ToJavaString(
           env,
           profile.GetRawInfo(ADDRESS_HOME_LINE1)).obj(),
       ConvertUTF16ToJavaString(
           env,
           profile.GetRawInfo(ADDRESS_HOME_LINE2)).obj(),
       ConvertUTF16ToJavaString(
           env,
@@ skipping 59 matching lines @@
       EMAIL_ADDRESS,
       ConvertJavaStringToUTF16(
           Java_AutofillProfile_getEmailAddress(env, jprofile)));
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(
     JNIEnv* env,
     const CreditCard& card) {
   return Java_CreditCard_create(
       env,
-      ConvertUTF8ToJavaString(env, card.GetGUID()).obj(),
+      ConvertUTF8ToJavaString(env, card.guid()).obj(),
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NAME)).obj(),
       ConvertUTF16ToJavaString(env, card.GetRawInfo(CREDIT_CARD_NUMBER)).obj(),
       ConvertUTF16ToJavaString(env, card.ObfuscatedNumber()).obj(),
       ConvertUTF16ToJavaString(
           env,
           card.GetRawInfo(CREDIT_CARD_EXP_MONTH)).obj(),
       ConvertUTF16ToJavaString(
           env,
           card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR)).obj());
 }
@@ skipping 70 matching lines @@
   AutofillProfile profile;
   PopulateNativeProfileFromJava(jprofile, env, &profile);
 
   if (guid.empty()) {
     personal_data_manager_->AddProfile(profile);
   } else {
     profile.set_guid(guid);
     personal_data_manager_->UpdateProfile(profile);
   }
 
-  return ConvertUTF8ToJavaString(env, profile.GetGUID());
+  return ConvertUTF8ToJavaString(env, profile.guid());
 }
 
 
 jint PersonalDataManagerAndroid::GetCreditCardCount(JNIEnv* unused_env,
                                                     jobject unused_obj) {
   return personal_data_manager_->credit_cards().size();
 }
 
 ScopedJavaLocalRef<jobject> PersonalDataManagerAndroid::GetCreditCardByIndex(
     JNIEnv* env,
@@ skipping 28 matching lines @@
 
   CreditCard card;
   PopulateNativeCreditCardFromJava(jcard, env, &card);
 
   if (guid.empty()) {
     personal_data_manager_->AddCreditCard(card);
   } else {
     card.set_guid(guid);
     personal_data_manager_->UpdateCreditCard(card);
   }
-  return ConvertUTF8ToJavaString(env, card.GetGUID());
+  return ConvertUTF8ToJavaString(env, card.guid());
 }
 
 void PersonalDataManagerAndroid::RemoveByGUID(JNIEnv* env,
                                               jobject unused_obj,
                                               jstring jguid) {
   personal_data_manager_->RemoveByGUID(ConvertJavaStringToUTF8(env, jguid));
 }
 
 void PersonalDataManagerAndroid::OnPersonalDataChanged() {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (weak_java_obj_.get(env).is_null())
     return;
 
   Java_PersonalDataManager_personalDataChanged(env,
                                                weak_java_obj_.get(env).obj());
 }
 
 // static
 bool PersonalDataManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static jint Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<jint>(personal_data_manager_android);
 }
 
 }  // namespace autofill