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

Unified Diff: net/http/transport_security_state.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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/transport_security_state.h ('k') | net/http/transport_security_state_static.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/transport_security_state.cc
diff --git a/net/base/transport_security_state.cc b/net/http/transport_security_state.cc
similarity index 99%
rename from net/base/transport_security_state.cc
rename to net/http/transport_security_state.cc
index 50b4dac25309ca27d51965e4e8754e3c254e29e0..05ec5a9605a0d9751315a5af0b8679cc54993c8b 100644
--- a/net/base/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "net/base/transport_security_state.h"
+#include "net/http/transport_security_state.h"
#if defined(USE_OPENSSL)
#include <openssl/ecdsa.h>
@@ -11,8 +11,8 @@
#include <cryptohi.h>
#include <hasht.h>
#include <keyhi.h>
-#include <pk11pub.h>
#include <nspr.h>
+#include <pk11pub.h>
#endif
#include <algorithm>
@@ -31,10 +31,10 @@
#include "crypto/sha2.h"
#include "googleurl/src/gurl.h"
#include "net/base/dns_util.h"
-#include "net/base/ssl_info.h"
#include "net/base/x509_cert_types.h"
#include "net/base/x509_certificate.h"
#include "net/http/http_security_headers.h"
+#include "net/ssl/ssl_info.h"
#if defined(USE_OPENSSL)
#include "crypto/openssl_util.h"
@@ -582,7 +582,7 @@ static bool HasPreload(const struct HSTSPreload* entries, size_t num_entries,
return false;
}
-#include "net/base/transport_security_state_static.h"
+#include "net/http/transport_security_state_static.h"
// Returns the HSTSPreload entry for the |canonicalized_host| in |entries|,
// or NULL if there is none. Prefers exact hostname matches to those that
« no previous file with comments | « net/http/transport_security_state.h ('k') | net/http/transport_security_state_static.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698