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

components/autofill/core/browser/autofill_external_delegate.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 "components/autofill/core/browser/autofill_external_delegate.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 90 matching lines @@
   for (size_t i = 0; i < suggestions.size(); ++i) {
     if (suggestions[i].frontend_id > 0) {
       has_autofill_suggestions_ = true;
       break;
     }
   }
 
   if (has_autofill_suggestions_)
     ApplyAutofillOptions(&suggestions);
 
-  // Append the credit card signin promo, if appropriate.
-  if (should_show_cc_signin_promo_) {
+  // Append the credit card signin promo, if appropriate (there are no other
+  // suggestions).
+  if (suggestions.empty() && should_show_cc_signin_promo_) {
 // No separator on Android.
 #if !defined(OS_ANDROID)
     // If there are autofill suggestions, the "Autofill options" row was added
     // above. Add a separator between it and the signin promo.
     if (has_autofill_suggestions_) {
       suggestions.push_back(Suggestion());
       suggestions.back().frontend_id = POPUP_ITEM_ID_SEPARATOR;
     }
 #endif
 
@@ skipping 243 matching lines @@
   suggestions->insert(suggestions->begin(), data_list_values_.size(),
                       Suggestion());
   for (size_t i = 0; i < data_list_values_.size(); i++) {
     (*suggestions)[i].value = data_list_values_[i];
     (*suggestions)[i].label = data_list_labels_[i];
     (*suggestions)[i].frontend_id = POPUP_ITEM_ID_DATALIST_ENTRY;
   }
 }
 
 }  // namespace autofill