Remove "Use billing for shipping" checkbox in favor of item in suggestions menu.

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 "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
@@ skipping 37 matching lines @@
   virtual void UpdateAccountChooser() OVERRIDE {}
   virtual void UpdateButtonStrip() OVERRIDE {}
   virtual void UpdateSection(DialogSection section, UserInputAction action)
       OVERRIDE {}
   virtual void GetUserInput(DialogSection section, DetailOutputMap* output)
       OVERRIDE {
     *output = outputs_[section];
   }
 
   virtual string16 GetCvc() OVERRIDE { return string16(); }
-  virtual bool UseBillingForShipping() OVERRIDE { return false; }
   virtual bool SaveDetailsLocally() OVERRIDE { return true; }
   virtual const content::NavigationController* ShowSignIn() OVERRIDE {
     return NULL;
   }
   virtual void HideSignIn() OVERRIDE {}
   virtual void UpdateProgressBar(double value) OVERRIDE {}
   virtual void SubmitForTesting() OVERRIDE {}
   virtual void CancelForTesting() OVERRIDE {}
 
   MOCK_METHOD0(ModelChanged, void());
@@ skipping 288 matching lines @@
          iter != shipping_inputs.end(); ++iter) {
       controller()->InputIsValid(iter->type, string16());
     }
   }
 }
 
 TEST_F(AutofillDialogControllerTest, AutofillProfiles) {
   ui::MenuModel* shipping_model =
       controller()->MenuModelForSection(SECTION_SHIPPING);
   // Since the PersonalDataManager is empty, this should only have the
-  // "add new" menu item.
-  EXPECT_EQ(1, shipping_model->GetItemCount());
+  // "use billing", "add new" and "manage" menu items.
+  EXPECT_EQ(3, shipping_model->GetItemCount());
 
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(2);
 
   // Empty profiles are ignored.
   AutofillProfile empty_profile(base::GenerateGUID());
   empty_profile.SetRawInfo(NAME_FULL, ASCIIToUTF16("John Doe"));
   controller()->GetTestingManager()->AddTestingProfile(&empty_profile);
   shipping_model = controller()->MenuModelForSection(SECTION_SHIPPING);
-  EXPECT_EQ(1, shipping_model->GetItemCount());
+  EXPECT_EQ(3, shipping_model->GetItemCount());
 
   // A full profile should be picked up.
   AutofillProfile full_profile(test::GetFullProfile());
   full_profile.SetRawInfo(ADDRESS_HOME_LINE2, string16());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   shipping_model = controller()->MenuModelForSection(SECTION_SHIPPING);
-  EXPECT_EQ(2, shipping_model->GetItemCount());
+  EXPECT_EQ(4, shipping_model->GetItemCount());
 }
 
 TEST_F(AutofillDialogControllerTest, AutofillProfileVariants) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
+  ui::MenuModel* email_model =
+      controller()->MenuModelForSection(SECTION_EMAIL);
+  EXPECT_EQ(2, email_model->GetItemCount());
 
   // Set up some variant data.
   AutofillProfile full_profile(test::GetFullProfile());
   std::vector<string16> names;
   names.push_back(ASCIIToUTF16("John Doe"));
   names.push_back(ASCIIToUTF16("Jane Doe"));
   full_profile.SetRawMultiInfo(EMAIL_ADDRESS, names);
   const string16 kEmail1 = ASCIIToUTF16("user@example.com");
   const string16 kEmail2 = ASCIIToUTF16("admin@example.com");
   std::vector<string16> emails;
   emails.push_back(kEmail1);
   emails.push_back(kEmail2);
   full_profile.SetRawMultiInfo(EMAIL_ADDRESS, emails);
 
   // Respect variants for the email address field only.
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   ui::MenuModel* shipping_model =
       controller()->MenuModelForSection(SECTION_SHIPPING);
-  EXPECT_EQ(2, shipping_model->GetItemCount());
-  ui::MenuModel* email_model =
-      controller()->MenuModelForSection(SECTION_EMAIL);
-  EXPECT_EQ(3, email_model->GetItemCount());
+  EXPECT_EQ(4, shipping_model->GetItemCount());
+  email_model = controller()->MenuModelForSection(SECTION_EMAIL);
+  EXPECT_EQ(4, email_model->GetItemCount());
 
   email_model->ActivatedAt(0);
   EXPECT_EQ(kEmail1,
             controller()->SuggestionStateForSection(SECTION_EMAIL).text);
   email_model->ActivatedAt(1);
   EXPECT_EQ(kEmail2,
             controller()->SuggestionStateForSection(SECTION_EMAIL).text);
 
   controller()->EditClickedForSection(SECTION_EMAIL);
   const DetailInputs& inputs =
@@ skipping 68 matching lines @@
 TEST_F(AutofillDialogControllerTest, EditClickedCancelled) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
 
   AutofillProfile full_profile(test::GetFullProfile());
   const string16 kEmail = ASCIIToUTF16("first@johndoe.com");
   full_profile.SetRawInfo(EMAIL_ADDRESS, kEmail);
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
 
   ui::MenuModel* email_model =
       controller()->MenuModelForSection(SECTION_EMAIL);
-  EXPECT_EQ(2, email_model->GetItemCount());
+  EXPECT_EQ(3, email_model->GetItemCount());
 
   // When unedited, the initial_value should be empty.
   email_model->ActivatedAt(0);
   const DetailInputs& inputs0 =
       controller()->RequestedFieldsForSection(SECTION_EMAIL);
   EXPECT_EQ(string16(), inputs0[0].initial_value);
   EXPECT_EQ(kEmail,
             controller()->SuggestionStateForSection(SECTION_EMAIL).text);
 
   // When edited, the initial_value should contain the value.
@@ skipping 300 matching lines @@
   wallet_items->AddAddress(wallet::GetTestShippingAddress());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   EXPECT_TRUE(NotificationsOfType(
       DialogNotification::EXPLANATORY_MESSAGE).empty());
   EXPECT_TRUE(NotificationsOfType(
       DialogNotification::WALLET_USAGE_CONFIRMATION).empty());
 }
 
 }  // namespace autofill