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

trunk/src/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogGlue.java

Index: trunk/src/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogGlue.java
===================================================================
--- trunk/src/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogGlue.java	(revision 195318)
+++ trunk/src/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogGlue.java	(working copy)
@@ -23,20 +23,21 @@
     private final AutofillDialogAccountHelper mAccountHelper;
 
     public AutofillDialogGlue(int nativeAutofillDialogViewAndroid, WindowAndroid nativeWindow,
-            String saveLocallyText) {
+            String useBillingForShippingText, String saveLocallyText) {
         mNativeDialogPopup = nativeAutofillDialogViewAndroid;
         mAccountHelper = new AutofillDialogAccountHelper(this, nativeWindow.getContext());
 
-        mAutofillDialog = new AutofillDialog(nativeWindow.getContext(), this, saveLocallyText);
+        mAutofillDialog = new AutofillDialog(
+                nativeWindow.getContext(), this, useBillingForShippingText, saveLocallyText);
         mAutofillDialog.show();
     }
 
     @CalledByNative
     private static AutofillDialogGlue create(int nativeAutofillDialogViewAndroid,
             WindowAndroid nativeWindow,
-            String saveLocallyText) {
+            String useBillingForShippingText, String saveLocallyText) {
         return new AutofillDialogGlue(nativeAutofillDialogViewAndroid, nativeWindow,
-                saveLocallyText);
+                useBillingForShippingText, saveLocallyText);
     }
 
     /**
@@ -98,6 +99,14 @@
     }
 
     /**
+     * @see AutofillDialog#shouldUseBillingForShipping()
+     */
+    @CalledByNative
+    private boolean shouldUseBillingForShipping() {
+        return mAutofillDialog.shouldUseBillingForShipping();
+    }
+
+    /**
      * @see AutofillDialog#shouldSaveDetailsLocally()
      */
     @CalledByNative