Http Bad: Put icon on the left of http warning message on Views

chrome/browser/ui/autofill/autofill_popup_layout_model_unittest.cc

 // Copyright (c) 2016 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/autofill/autofill_popup_layout_model.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 32 matching lines @@
   bool IsRTL() const override { return false; }
 
   const std::vector<autofill::Suggestion> GetSuggestions() override {
     // Give elements 1 and 3 subtexts and elements 2 and 3 icons, to ensure
     // all combinations of subtexts and icons.
     std::vector<Suggestion> suggestions;
     suggestions.push_back(Suggestion("", "", "", 0));
     suggestions.push_back(Suggestion("", "x", "", 0));
     suggestions.push_back(Suggestion("", "", "americanExpressCC", 0));
     suggestions.push_back(Suggestion("", "x", "genericCC", 0));
+    // Http warning message.
+    suggestions.push_back(Suggestion("x", "x", "http", -10));

[Mathieu, 2016/11/22 14:36:45]

nit: use the popup_item_id enum instead of -10?

[lshang, 2016/11/27 04:59:13]

Done.

     return suggestions;
   }
 #if !defined(OS_ANDROID)
   int GetElidedValueWidthForRow(size_t row) override { return 0; }
   int GetElidedLabelWidthForRow(size_t row) override { return 0; }
 #endif
 
  private:
   gfx::RectF element_bounds_;
   gfx::NativeView container_view_;
@@ skipping 32 matching lines @@
                 ui::ResourceBundle::GetSharedInstance()
                     .GetImageNamed(IDR_AUTOFILL_CC_AMEX)
                     .Width(),
             layout_model()->RowWidthWithoutText(2, /* with_label= */ false));
   EXPECT_EQ(base_size + subtext_increase +
                 AutofillPopupLayoutModel::kIconPadding +
                 ui::ResourceBundle::GetSharedInstance()
                     .GetImageNamed(IDR_AUTOFILL_CC_GENERIC)
                     .Width(),
             layout_model()->RowWidthWithoutText(3, /* with_label= */ true));
+  EXPECT_EQ(base_size + AutofillPopupLayoutModel::kHttpWarningNamePadding +
+                AutofillPopupLayoutModel::kHttpWarningIconPadding +
+                ui::ResourceBundle::GetSharedInstance()
+                    .GetImageNamed(IDR_AUTOFILL_HTTP_WARNING)
+                    .Width(),
+            layout_model()->RowWidthWithoutText(4, /* with_label= */ true));
 }
 #endif
 
 }  // namespace autofill