Log SSL.MarkHttpAs histogram without regard to state of the page

components/security_state/security_state_model_unittest.cc

 // Copyright 2015 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/security_state/security_state_model.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/test/histogram_tester.h"
@@ skipping 286 matching lines @@
   client.UseHttpUrl();
   SecurityStateModel model;
   model.SetClient(&client);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
   EXPECT_FALSE(security_info.displayed_private_user_data_input_on_http);
   EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
 }
 
 // Tests that SSL.MarkHttpAsStatus histogram is updated when security state is
-// computed for a page containing a password field on HTTP.
+// computed for a page.
 TEST(SecurityStateModelTest, MarkHttpAsStatusHistogram) {
   const char* kHistogramName = "SSL.MarkHttpAsStatus";
   base::HistogramTester histograms;
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kMarkHttpAs, switches::kMarkHttpWithPasswordsOrCcWithChip);
   TestSecurityStateModelClient client;
   client.UseHttpUrl();
   SecurityStateModel model;
   model.SetClient(&client);
+
+  // Ensure histogram recorded correctly when a non-secure password input is
+  // found on the page.
   client.set_displayed_password_field_on_http(true);
   SecurityStateModel::SecurityInfo security_info;
   histograms.ExpectTotalCount(kHistogramName, 0);
   model.GetSecurityInfo(&security_info);
   histograms.ExpectUniqueSample(kHistogramName, 2 /* HTTP_SHOW_WARNING */, 1);
+
+  // Ensure histogram recorded correctly even without a password input.
+  client.set_displayed_password_field_on_http(false);
+  model.GetSecurityInfo(&security_info);
+  histograms.ExpectUniqueSample(kHistogramName, 2 /* HTTP_SHOW_WARNING */, 2);
 }
 
 }  // namespace
 
 }  // namespace security_state