Don't display drop down arrows in rAc dialog unless there is a suggestion

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 345 matching lines @@
     }
   }
 }
 
 TEST_F(AutofillDialogControllerTest, AutofillProfiles) {
   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.
   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(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(3, shipping_model->GetItemCount());
+  EXPECT_FALSE(controller()->MenuModelForSection(SECTION_EMAIL));
 
   // 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(4, shipping_model->GetItemCount());
+  EXPECT_TRUE(!!controller()->MenuModelForSection(SECTION_EMAIL));
 }
 
 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());
+  EXPECT_FALSE(email_model);
 
   // 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(kFakeEmail);
   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(4, shipping_model->GetItemCount());
   email_model = controller()->MenuModelForSection(SECTION_EMAIL);
+  ASSERT_TRUE(!!email_model);
   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);
@@ skipping 211 matching lines @@
   controller()->OnDidGetFullWallet(CreateFullWalletWithVerifyCvv());
 
   EXPECT_FALSE(
       NotificationsOfType(DialogNotification::REQUIRED_ACTION).empty());
   EXPECT_FALSE(controller()->SectionIsActive(SECTION_SHIPPING));
   EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC_BILLING));
 
   suggestion_state =
       controller()->SuggestionStateForSection(SECTION_CC_BILLING);
   EXPECT_FALSE(suggestion_state.extra_text.empty());
-  EXPECT_EQ(
-      0, controller()->MenuModelForSection(SECTION_CC_BILLING)->GetItemCount());
+  EXPECT_FALSE(controller()->MenuModelForSection(SECTION_CC_BILLING));
 
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL));
 
   controller()->OnAccept();
 }
 
 TEST_F(AutofillDialogControllerTest, ErrorDuringSubmit) {
   SetUpWallet();
 
@@ skipping 293 matching lines @@
   EXPECT_FALSE(controller()->ShouldOfferToSaveInChrome());
 
   controller()->MenuModelForSection(SECTION_EMAIL)->ActivatedAt(1);
   EXPECT_TRUE(controller()->ShouldOfferToSaveInChrome());
 
   profile()->set_incognito(true);
   EXPECT_FALSE(controller()->ShouldOfferToSaveInChrome());
 }
 
 }  // namespace autofill