Revert 195316 "Remove "Use billing for shipping" checkbox in fav..."

trunk/src/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc

Index: trunk/src/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc
===================================================================
--- trunk/src/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc	(revision 195318)
+++ trunk/src/chrome/browser/ui/android/autofill/autofill_dialog_view_android.cc	(working copy)
@@ -37,6 +37,9 @@
 
 void AutofillDialogViewAndroid::Show() {
   JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> use_billing_for_shipping_text =
+      base::android::ConvertUTF16ToJavaString(
+          env, controller_->UseBillingForShippingText());
   ScopedJavaLocalRef<jstring> save_locally_text =
         base::android::ConvertUTF16ToJavaString(
             env, controller_->SaveLocallyText());
@@ -45,6 +48,7 @@
       reinterpret_cast<jint>(this),
       WindowAndroidHelper::FromWebContents(controller_->web_contents())->
           GetWindowAndroid()->GetJavaObject().obj(),
+      use_billing_for_shipping_text.obj(),
       save_locally_text.obj()));
 }
 
@@ -215,6 +219,12 @@
   return base::android::ConvertJavaStringToUTF16(env, cvc.obj());
 }
 
+bool AutofillDialogViewAndroid::UseBillingForShipping() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return Java_AutofillDialogGlue_shouldUseBillingForShipping(
+      env, java_object_.obj());
+}
+
 bool AutofillDialogViewAndroid::SaveDetailsLocally() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_AutofillDialogGlue_shouldSaveDetailsLocally(env,
@@ -323,7 +333,6 @@
 void AutofillDialogViewAndroid::EditingStart(JNIEnv* env, jobject obj,
                                              jint jsection) {
   const DialogSection section = static_cast<DialogSection>(jsection);
-  // TODO(estade): respect |suggestion_state.text_style|.
   const SuggestionState& suggestion_state =
       controller_->SuggestionStateForSection(section);
   if (suggestion_state.text.empty()) {