Fix styling of Form-Not-Secure warnings on Android

chrome/browser/ui/android/autofill/autofill_popup_view_android.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 "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/autofill_util.h"
+#include "components/security_state/core/security_state.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/AutofillPopupBridge_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
@@ skipping 61 matching lines @@
     int android_icon_id = 0;
 
     const Suggestion& suggestion = controller_->GetSuggestionAt(i);
     if (!suggestion.icon.empty()) {
       android_icon_id = ResourceMapper::MapFromChromiumId(
           controller_->layout_model().GetIconResourceID(suggestion.icon));
     }
 
     bool is_deletable =
         controller_->GetRemovalConfirmationText(i, nullptr, nullptr);
+    // In the Form-Not-Secure experiment, the payment disabled message
+    // is a short message that should be displayed the same as the other
+    // autofill suggestions. If this experiment is not enabled, then the
+    // payment disabled message should be allowed to span multiple
+    // lines.
     bool is_label_multiline =
-        suggestion.frontend_id ==
-            POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE ||
+        (!security_state::IsHttpWarningInFormEnabled() &&
+         suggestion.frontend_id ==
+             POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE) ||
         suggestion.frontend_id == POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO;
     Java_AutofillPopupBridge_addToAutofillSuggestionArray(
         env, data_array, i, value, label, android_icon_id,
         controller_->layout_model().IsIconAtStart(suggestion.frontend_id),
         suggestion.frontend_id, is_deletable, is_label_multiline,
         suggestion.is_value_bold);
   }
 
   Java_AutofillPopupBridge_show(
       env, java_object_, data_array, controller_->IsRTL(),
@@ skipping 60 matching lines @@
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   if (IsKeyboardAccessoryEnabled())
     return new AutofillKeyboardAccessoryView(controller);
 
   return new AutofillPopupViewAndroid(controller);
 }
 
 }  // namespace autofill