[rAc] Move email address into billing address section.

chrome/browser/ui/android/autofill/autofill_dialog_controller_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/ui/android/autofill/autofill_dialog_controller_android.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 65 matching lines @@
   return scoped_ptr<DataModelWrapper>();
 }
 
 void FillOutputForSectionWithComparator(
     DialogSection section, const DetailInputs& inputs,
     const InputFieldComparator& compare,
     FormStructure& form_structure, wallet::FullWallet* full_wallet,
     const base::string16& email_address) {
 
   // Email is hidden while using Wallet, special case it.
-  if (section == SECTION_EMAIL) {
+  if (section == SECTION_CC_BILLING) {
     AutofillProfile profile;
     profile.SetRawInfo(EMAIL_ADDRESS, email_address);
     AutofillProfileWrapper profile_wrapper(&profile, 0);
     profile_wrapper.FillFormStructure(inputs, compare, &form_structure);
     return;
   }
 
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section, full_wallet);
   if (wrapper)
     wrapper->FillFormStructure(inputs, compare, &form_structure);
@@ skipping 264 matching lines @@
   const std::string last_used_billing =
       base::android::ConvertJavaStringToUTF8(env, jlast_used_billing);
   const std::string last_used_shipping =
       base::android::ConvertJavaStringToUTF8(env, jlast_used_shipping);
   const std::string last_used_card =
       base::android::ConvertJavaStringToUTF8(env, jlast_used_card);
 
   scoped_ptr<wallet::FullWallet> full_wallet =
       AutofillDialogResult::ConvertFromJava(env, wallet);
   FillOutputForSection(
-      SECTION_EMAIL, form_structure_, full_wallet.get(), email);
-  FillOutputForSection(
       SECTION_CC_BILLING, form_structure_, full_wallet.get(), email);
   FillOutputForSection(
       SECTION_SHIPPING, form_structure_, full_wallet.get(), email);
 
   {
     DictionaryPrefUpdate updater(profile_->GetPrefs(),
                                  ::prefs::kAutofillDialogDefaults);
     base::DictionaryValue* defaults = updater.Get();
     if (defaults) {
       const bool last_used_choice_is_autofill = !!jlast_used_choice_is_autofill;
@@ skipping 72 matching lines @@
   GetMetricLogger().LogDialogUiDuration(
       base::Time::Now() - dialog_shown_timestamp_,
       GetDialogType(),
       AutofillMetrics::DIALOG_CANCELED);
 
   GetMetricLogger().LogDialogUiEvent(
       GetDialogType(), AutofillMetrics::DIALOG_UI_CANCELED);
 }
 
 }  // namespace autofill