Updates to wallet for i18n

chrome/browser/ui/android/autofill/autofill_dialog_result.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/ui/android/autofill/autofill_dialog_result.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 27 matching lines @@
     (ConvertNullOrJavaStringTo##utf( \
         (env), FETCH_JFIELD((env), (jobj), cls, getter).obj()))
 
 scoped_ptr<wallet::Address> ParseJavaWalletAddress(
     JNIEnv* env, jobject address) {
   if (!address)
     return scoped_ptr<wallet::Address>();
 
   const base::string16 recipient_name =
       FETCH_JSTRING(UTF16, env, address, ResultAddress, Name);
-  const base::string16 address_line_1 =
-      FETCH_JSTRING(UTF16, env, address, ResultAddress, Address1);
-  const base::string16 address_line_2 =
-      FETCH_JSTRING(UTF16, env, address, ResultAddress, Address2);
+  std::vector<base::string16> address_lines;
+  address_lines.push_back(
+      FETCH_JSTRING(UTF16, env, address, ResultAddress, Address1));
+  address_lines.push_back(
+      FETCH_JSTRING(UTF16, env, address, ResultAddress, Address2));
   const base::string16 locality_name =
       FETCH_JSTRING(UTF16, env, address, ResultAddress, City);
   const base::string16 administrative_area_name =
       FETCH_JSTRING(UTF16, env, address, ResultAddress, State);
   const base::string16 postal_code_number =
       FETCH_JSTRING(UTF16, env, address, ResultAddress, PostalCode);
   const base::string16 phone_number =
       FETCH_JSTRING(UTF16, env, address, ResultAddress, PhoneNumber);
   const std::string country_name_code =
       FETCH_JSTRING(UTF8, env, address, ResultAddress, CountryCode);
   DCHECK(!country_name_code.empty());
 
+  // TODO(aruslan): get these from the JavaWalletAddress.
+  const base::string16 dependent_locality_name;
+  const base::string16 sorting_code;
+
   return scoped_ptr<wallet::Address>(new wallet::Address(
       country_name_code,
       recipient_name,
-      address_line_1,
-      address_line_2,
+      address_lines,
       locality_name,
+      dependent_locality_name,
       administrative_area_name,
       postal_code_number,
+      sorting_code,
       phone_number,
       std::string()));
 }
 
 scoped_ptr<wallet::FullWallet> ParseJavaWallet(JNIEnv* env, jobject wallet) {
   const ScopedJavaLocalRef<jobject> billing_address(
       FETCH_JFIELD(env, wallet, ResultWallet, BillingAddress));
   const ScopedJavaLocalRef<jobject> shipping_address(
       FETCH_JFIELD(env, wallet, ResultWallet, ShippingAddress));
   const ScopedJavaLocalRef<jobject> card(
@@ skipping 47 matching lines @@
     JNIEnv* env, jobject wallet) {
   return ParseGoogleTransactionId(env, wallet);
 }
 
 // static
 bool AutofillDialogResult::RegisterAutofillDialogResult(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace autofill