[rAc] Move email address into billing address section.

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 796 matching lines @@
   ui::MenuModel* shipping_model =
       controller()->MenuModelForSection(SECTION_SHIPPING);
   // Since the PersonalDataManager is empty, this should only have the
   // "use billing", "add new" and "manage" menu items.
   ASSERT_TRUE(shipping_model);
   EXPECT_EQ(3, shipping_model->GetItemCount());
   // On the other hand, the other models should be NULL when there's no
   // suggestion.
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC));
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_BILLING));
-  EXPECT_FALSE(controller()->MenuModelForSection(SECTION_EMAIL));
 
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(3);
 
   // Empty profiles are ignored.
   AutofillProfile empty_profile(base::GenerateGUID(), kSettingsOrigin);
   empty_profile.SetRawInfo(NAME_FULL, ASCIIToUTF16("John Doe"));
   controller()->GetTestingManager()->AddTestingProfile(&empty_profile);
   shipping_model = controller()->MenuModelForSection(SECTION_SHIPPING);
   ASSERT_TRUE(shipping_model);
   EXPECT_EQ(3, shipping_model->GetItemCount());
-  EXPECT_FALSE(controller()->MenuModelForSection(SECTION_EMAIL));
 
   // An otherwise full but unverified profile should be ignored.
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.set_origin("https://www.example.com");
   full_profile.SetRawInfo(ADDRESS_HOME_LINE2, string16());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   shipping_model = controller()->MenuModelForSection(SECTION_SHIPPING);
   ASSERT_TRUE(shipping_model);
   EXPECT_EQ(3, shipping_model->GetItemCount());
-  EXPECT_FALSE(controller()->MenuModelForSection(SECTION_EMAIL));
 
   // A full, verified profile should be picked up.
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   verified_profile.SetRawInfo(ADDRESS_HOME_LINE2, string16());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   shipping_model = controller()->MenuModelForSection(SECTION_SHIPPING);
   ASSERT_TRUE(shipping_model);
   EXPECT_EQ(4, shipping_model->GetItemCount());
-  EXPECT_TRUE(!!controller()->MenuModelForSection(SECTION_EMAIL));
 }
 
 // Makes sure that the choice of which Autofill profile to use for each section
 // is sticky.
 TEST_F(AutofillDialogControllerTest, AutofillProfileDefaults) {
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.set_origin(kSettingsOrigin);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   AutofillProfile full_profile2(test::GetFullProfile2());
   full_profile2.set_origin(kSettingsOrigin);
@@ skipping 731 matching lines @@
 
   // Also, the currently selected email address should get added to the new
   // profile.
   string16 original_email =
       full_profile.GetInfo(AutofillType(EMAIL_ADDRESS), "en-US");
   EXPECT_FALSE(original_email.empty());
   EXPECT_EQ(original_email,
             added_profile.GetInfo(AutofillType(EMAIL_ADDRESS), "en-US"));
 }
 
-// Makes sure that a newly added email address gets added to an existing profile
-// (as opposed to creating its own profile). http://crbug.com/240926
-TEST_F(AutofillDialogControllerTest, AddEmail) {
-  SwitchToAutofill();
-  EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(2);
-
-  AutofillProfile full_profile(test::GetVerifiedProfile());
-  CreditCard credit_card(test::GetVerifiedCreditCard());
-  controller()->GetTestingManager()->AddTestingProfile(&full_profile);
-  controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
-
-  ui::MenuModel* model = controller()->MenuModelForSection(SECTION_EMAIL);
-  ASSERT_TRUE(model);
-  // Activate the "Add email address" menu item.
-  model->ActivatedAt(model->GetItemCount() - 2);
-
-  // Fill in the inputs from the profile.
-  DetailOutputMap outputs;
-  const DetailInputs& inputs =
-      controller()->RequestedFieldsForSection(SECTION_EMAIL);
-  const DetailInput& input = inputs[0];
-  string16 new_email = ASCIIToUTF16("addemailtest@example.com");
-  outputs[&input] = new_email;
-  controller()->GetView()->SetUserInput(SECTION_EMAIL, outputs);
-
-  FillCreditCardInputs();
-  controller()->OnAccept();
-  std::vector<base::string16> email_values;
-  full_profile.GetMultiInfo(
-      AutofillType(EMAIL_ADDRESS), "en-US", &email_values);
-  ASSERT_EQ(2U, email_values.size());
-  EXPECT_EQ(new_email, email_values[1]);
-}
-
 TEST_F(AutofillDialogControllerTest, VerifyCvv) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               GetFullWallet(_)).Times(1);
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               AuthenticateInstrument(_, _)).Times(1);
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
 
   EXPECT_TRUE(NotificationsOfType(DialogNotification::REQUIRED_ACTION).empty());
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_SHIPPING));
@@ skipping 708 matching lines @@
   controller()->TabActivated();
 
   controller()->OnDidGetWalletItems(wallet::GetTestWalletItems());
 
   EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC_BILLING));
   EXPECT_EQ(
       3, controller()->MenuModelForSection(SECTION_SHIPPING)->GetItemCount());
 }
 
 }  // namespace autofill