Bring the handling of <keygen> and support for the application/x-x509-user-ce...

chrome/browser/ssl/ssl_host_state_unittest.cc

 // Copyright (c) 2010 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/ssl/ssl_host_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Certificates for test data. They're obtained with:
@@ skipping 96 matching lines @@
   state.HostRanInsecureContent("example.com", 42);
 
   EXPECT_TRUE(state.DidHostRunInsecureContent("www.google.com", 42));
   EXPECT_FALSE(state.DidHostRunInsecureContent("www.google.com", 191));
   EXPECT_TRUE(state.DidHostRunInsecureContent("example.com", 42));
 }
 
 TEST_F(SSLHostStateTest, QueryPolicy) {
   scoped_refptr<net::X509Certificate> google_cert =
       net::X509Certificate::CreateFromBytes(
-          reinterpret_cast<const char*>(google_der), sizeof(google_der));
+          reinterpret_cast<const char*>(google_der), sizeof(google_der),
+          X509Certificate::FORMAT_DER);
 
   SSLHostState state;
 
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "www.google.com"),
             net::X509Certificate::Policy::UNKNOWN);
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "google.com"),
             net::X509Certificate::Policy::UNKNOWN);
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "example.com"),
             net::X509Certificate::Policy::UNKNOWN);
 
@@ skipping 17 matching lines @@
 
   state.DenyCertForHost(google_cert.get(), "example.com");
 
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "www.google.com"),
             net::X509Certificate::Policy::ALLOWED);
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "google.com"),
             net::X509Certificate::Policy::UNKNOWN);
   EXPECT_EQ(state.QueryPolicy(google_cert.get(), "example.com"),
             net::X509Certificate::Policy::DENIED);
 }