Handle null values when constructing a native AutofillProfile from an Android one.

chrome/browser/autofill/android/personal_data_manager_android.cc

Index: chrome/browser/autofill/android/personal_data_manager_android.cc
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc
index 1bc540591d28df3e9956520232745382c1d9f969..5cb515caa57f0649a8e9e27e43158007a94e2377 100644
--- a/chrome/browser/autofill/android/personal_data_manager_android.cc
+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -73,53 +73,53 @@ ScopedJavaLocalRef<jobject> CreateJavaProfileFromNative(
       ConvertUTF8ToJavaString(env, profile.language_code()).obj());
 }
 
+void MaybeSetRawInfo(AutofillProfile* profile,
+                     autofill::ServerFieldType type,
+                     const base::android::JavaRef<jstring>& jstr) {
+  if (!jstr.is_null())
+    profile->SetRawInfo(type, ConvertJavaStringToUTF16(jstr));
+}
+
 void PopulateNativeProfileFromJava(
-    const jobject& jprofile,
+    const JavaParamRef<jobject>& jprofile,
     JNIEnv* env,
     AutofillProfile* profile) {
   profile->set_origin(
       ConvertJavaStringToUTF8(
-          Java_AutofillProfile_getOrigin(env, jprofile)));
-  profile->SetInfo(
-      AutofillType(NAME_FULL),
-      ConvertJavaStringToUTF16(Java_AutofillProfile_getFullName(env, jprofile)),
-      g_browser_process->GetApplicationLocale());
-  profile->SetRawInfo(autofill::COMPANY_NAME,
-                      ConvertJavaStringToUTF16(
-                          Java_AutofillProfile_getCompanyName(env, jprofile)));
-  profile->SetRawInfo(
-      autofill::ADDRESS_HOME_STREET_ADDRESS,
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getStreetAddress(env, jprofile)));
-  profile->SetRawInfo(
-      autofill::ADDRESS_HOME_STATE,
-      ConvertJavaStringToUTF16(Java_AutofillProfile_getRegion(env, jprofile)));
-  profile->SetRawInfo(autofill::ADDRESS_HOME_CITY,
-                      ConvertJavaStringToUTF16(
-                          Java_AutofillProfile_getLocality(env, jprofile)));
-  profile->SetRawInfo(
-      autofill::ADDRESS_HOME_DEPENDENT_LOCALITY,
-      ConvertJavaStringToUTF16(
-          Java_AutofillProfile_getDependentLocality(env, jprofile)));
-  profile->SetRawInfo(autofill::ADDRESS_HOME_ZIP,
-                      ConvertJavaStringToUTF16(
-                          Java_AutofillProfile_getPostalCode(env, jprofile)));
-  profile->SetRawInfo(autofill::ADDRESS_HOME_SORTING_CODE,
-                      ConvertJavaStringToUTF16(
-                          Java_AutofillProfile_getSortingCode(env, jprofile)));
-  profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
+          Java_AutofillProfile_getOrigin(env, jprofile.obj())));
+  profile->SetInfo(AutofillType(NAME_FULL),
                    ConvertJavaStringToUTF16(
-                       Java_AutofillProfile_getCountryCode(env, jprofile)),
+                       Java_AutofillProfile_getFullName(env, jprofile.obj())),
                    g_browser_process->GetApplicationLocale());
-  profile->SetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER,
-                      ConvertJavaStringToUTF16(
-                          Java_AutofillProfile_getPhoneNumber(env, jprofile)));
-  profile->SetRawInfo(autofill::EMAIL_ADDRESS,
-                      ConvertJavaStringToUTF16(
-                          Java_AutofillProfile_getEmailAddress(env, jprofile)));
+  MaybeSetRawInfo(profile, autofill::COMPANY_NAME,
+                  Java_AutofillProfile_getCompanyName(env, jprofile.obj()));
+  MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_STREET_ADDRESS,
+                  Java_AutofillProfile_getStreetAddress(env, jprofile.obj()));
+  MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_STATE,
+                  Java_AutofillProfile_getRegion(env, jprofile.obj()));
+  MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_CITY,
+                  Java_AutofillProfile_getLocality(env, jprofile.obj()));
+  MaybeSetRawInfo(
+      profile, autofill::ADDRESS_HOME_DEPENDENT_LOCALITY,
+      Java_AutofillProfile_getDependentLocality(env, jprofile.obj()));
+  MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_ZIP,
+                  Java_AutofillProfile_getPostalCode(env, jprofile.obj()));
+  MaybeSetRawInfo(profile, autofill::ADDRESS_HOME_SORTING_CODE,
+                  Java_AutofillProfile_getSortingCode(env, jprofile.obj()));
+  ScopedJavaLocalRef<jstring> country_code =
+      Java_AutofillProfile_getCountryCode(env, jprofile.obj());
+  if (!country_code.is_null()) {
+    profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
+                     ConvertJavaStringToUTF16(country_code),
+                     g_browser_process->GetApplicationLocale());
+  }
+  MaybeSetRawInfo(profile, autofill::PHONE_HOME_WHOLE_NUMBER,
+                  Java_AutofillProfile_getPhoneNumber(env, jprofile.obj()));
+  MaybeSetRawInfo(profile, autofill::EMAIL_ADDRESS,
+                  Java_AutofillProfile_getEmailAddress(env, jprofile.obj()));
   profile->set_language_code(
       ConvertJavaStringToUTF8(
-          Java_AutofillProfile_getLanguageCode(env, jprofile)));
+          Java_AutofillProfile_getLanguageCode(env, jprofile.obj())));
 }
 
 ScopedJavaLocalRef<jobject> CreateJavaCreditCardFromNative(