Remove the test-only X509Certificate constructor

chrome/browser/ui/website_settings/website_settings_unittest.cc

 // Copyright (c) 2012 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/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
@@ skipping 15 matching lines @@
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "device/core/mock_device_client.h"
 #include "device/usb/mock_usb_device.h"
 #include "device/usb/mock_usb_service.h"
 #include "grit/theme_resources.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
+#include "net/test/cert_test_util.h"
 #include "net/test/test_certificate_data.h"
+#include "net/test/test_data_directory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::SSLStatus;
 using security_state::SecurityStateModel;
 using testing::_;
 using testing::AnyNumber;
 using testing::Invoke;
 using testing::Return;
 using testing::SetArgPointee;
@@ skipping 43 matching lines @@
   ~WebsiteSettingsTest() override {}
 
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     // Setup stub SSLStatus.
     security_info_.security_level = SecurityStateModel::NONE;
 
     // Create the certificate.
     cert_id_ = 1;
-    base::Time start_date = base::Time::Now();
-    base::Time expiration_date = base::Time::FromInternalValue(
-        start_date.ToInternalValue() + base::Time::kMicrosecondsPerWeek);
-    cert_ = new net::X509Certificate("subject",
-                                     "issuer",
-                                     start_date,
-                                     expiration_date);
+    cert_ =
+        net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
+    ASSERT_TRUE(cert_);
 
     TabSpecificContentSettings::CreateForWebContents(web_contents());
     InfoBarService::CreateForWebContents(web_contents());
 
     // Setup the mock cert store.
     EXPECT_CALL(cert_store_, RetrieveCert(cert_id_, _) )
         .Times(AnyNumber())
         .WillRepeatedly(DoAll(SetArgPointee<1>(cert_), Return(true)));
 
     // Setup mock ui.
@@ skipping 670 matching lines @@
 
 TEST_F(WebsiteSettingsTest, InternalPage) {
   SetURL("chrome://bookmarks");
   SetDefaultUIExpectations(mock_ui());
   EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE,
             website_settings()->site_connection_status());
   EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE,
             website_settings()->site_identity_status());
   EXPECT_EQ(base::string16(), website_settings()->organization_name());
 }