Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(350)

Unified Diff: net/http/transport_security_state_unittest.cc

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/des.cc ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/transport_security_state_unittest.cc
diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc
index 3eac030393dcb0a809aa8ef26be5f4f751286113..214020907d9a5fe1723bfd273dc6ec0809646a39 100644
--- a/net/http/transport_security_state_unittest.cc
+++ b/net/http/transport_security_state_unittest.cc
@@ -16,6 +16,7 @@
#include "base/strings/string_piece.h"
#include "base/test/histogram_tester.h"
#include "base/values.h"
+#include "crypto/openssl_util.h"
#include "crypto/sha2.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
@@ -34,12 +35,6 @@
#include "net/test/cert_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(USE_OPENSSL)
-#include "crypto/openssl_util.h"
-#else
-#include "crypto/nss_util.h"
-#endif
-
namespace net {
namespace {
@@ -236,11 +231,7 @@ void CheckHPKPReport(
class TransportSecurityStateTest : public testing::Test {
public:
void SetUp() override {
-#if defined(USE_OPENSSL)
crypto::EnsureOpenSSLInit();
-#else
- crypto::EnsureNSSInit();
-#endif
}
static void DisableStaticPins(TransportSecurityState* state) {
« no previous file with comments | « net/http/des.cc ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698