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>
 
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view_delegate.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/grit/components_scaled_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace autofill {
 
 namespace {
 
 class TestAutofillPopupViewDelegate : public AutofillPopupViewDelegate {
  public:
   explicit TestAutofillPopupViewDelegate(content::WebContents* web_contents)
       : element_bounds_(0.0, 0.0, 100.0, 100.0),
@@ skipping 10 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", "httpWarning",
+                   POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE));
     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 +
+                layout_model()->GetIconImage(4).width(),
+            layout_model()->RowWidthWithoutText(4, /* with_label= */ true));
 }
 #endif
 
 }  // namespace autofill