[Autofill] Remove warning for CC autofill on secure pages with mixed passive content

chrome/browser/ui/autofill/chrome_autofill_client.cc

 // Copyright 2014 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/chrome_autofill_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 366 matching lines @@
 bool ChromeAutofillClient::IsContextSecure(const GURL& form_origin) {
   content::SSLStatus ssl_status;
   content::NavigationEntry* navigation_entry =
       web_contents()->GetController().GetLastCommittedEntry();
   if (!navigation_entry)
      return false;
 
   ssl_status = navigation_entry->GetSSL();
   // Note: If changing the implementation below, also change
   // AwAutofillClient::IsContextSecure. See crbug.com/505388
-  return ssl_status.security_style ==
-      content::SECURITY_STYLE_AUTHENTICATED &&
-      ssl_status.content_status == content::SSLStatus::NORMAL_CONTENT;
+  return ssl_status.security_style == content::SECURITY_STYLE_AUTHENTICATED &&
+         (ssl_status.content_status == content::SSLStatus::NORMAL_CONTENT ||
+          ssl_status.content_status ==
+              content::SSLStatus::DISPLAYED_INSECURE_CONTENT);

[Evan Stade, 2016/02/01 20:40:36]

nit: perhaps

!(ssl_status.content_status & content::SSLStatus::RAN_INSECURE_CONTENT)

instead of these two equality checks? equality checks seem weird when dealing
with a bitmask.

[Mathieu, 2016/02/01 20:49:56]

Done.

 }
 
 }  // namespace autofill