[Merge M55] [Autofill] Do not show the credit card promo if there are CC suggestions.

components/autofill/core/browser/autofill_external_delegate_unittest.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 <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 177 matching lines @@
                   AutofillDriver::FORM_DATA_ACTION_FILL, _, _, _, _));
   EXPECT_CALL(autofill_client_, HideAutofillPopup());
 
   // This should trigger a call to hide the popup since we've selected an
   // option.
   external_delegate_->DidAcceptSuggestion(autofill_item[0].value,
                                           autofill_item[0].frontend_id,
                                           0);
 }
 
-// Test that our external delegate properly adds the signin promo and its
+// Test that our external delegate does not add the signin promo and its
 // separator in the popup items when there are suggestions.
 TEST_F(AutofillExternalDelegateUnitTest,
-       TestSigninPromoIsAdded_WithSuggestions) {
+       TestSigninPromoIsNotAdded_WithSuggestions) {
   EXPECT_CALL(*autofill_manager_, ShouldShowCreditCardSigninPromo(_, _))
       .WillOnce(testing::Return(true));
 
   IssueOnQuery(kQueryId);
 
   // The enums must be cast to ints to prevent compile errors on linux_rel.
-  auto element_ids = testing::ElementsAre(
-      kAutofillProfileId,
+  auto element_ids =
+      testing::ElementsAre(kAutofillProfileId,
 #if !defined(OS_ANDROID)
-      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
+                           static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
 #endif
-      static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS),
-#if !defined(OS_ANDROID)
-      static_cast<int>(POPUP_ITEM_ID_SEPARATOR),
-#endif
-      static_cast<int>(POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO));
+                           static_cast<int>(POPUP_ITEM_ID_AUTOFILL_OPTIONS));
 
   EXPECT_CALL(autofill_client_,
               ShowAutofillPopup(_, _, SuggestionVectorIdsAre(element_ids), _));
 
   base::UserActionTester user_action_tester;
 
   // This should call ShowAutofillPopup.
   std::vector<Suggestion> autofill_item;
   autofill_item.push_back(Suggestion());
   autofill_item[0].frontend_id = kAutofillProfileId;
   external_delegate_->OnSuggestionsReturned(kQueryId, autofill_item);
-  EXPECT_EQ(1, user_action_tester.GetActionCount(
+  EXPECT_EQ(0, user_action_tester.GetActionCount(
                    "Signin_Impression_FromAutofillDropdown"));
 
   EXPECT_CALL(
       *autofill_manager_,
       FillOrPreviewForm(AutofillDriver::FORM_DATA_ACTION_FILL, _, _, _, _));
   EXPECT_CALL(autofill_client_, HideAutofillPopup());
 
   // This should trigger a call to hide the popup since we've selected an
   // option.
   external_delegate_->DidAcceptSuggestion(autofill_item[0].value,
@@ skipping 449 matching lines @@
               RendererShouldFillFieldWithValue(dummy_string));
   base::HistogramTester histogram_tester;
   external_delegate_->DidAcceptSuggestion(dummy_string,
                                           POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY,
                                           0);
   histogram_tester.ExpectUniqueSample(
       "Autofill.SuggestionAcceptedIndex.Autocomplete", 0, 1);
 }
 
 }  // namespace autofill