Move net/ocsp/* into net/cert_net/

BUG=455366
TBR=mmenke@chromium.org,gunsch@chromium.org

Review URL: https://codereview.chromium.org/1070893002

Cr-Commit-Position: refs/heads/master@{#324386}

13 files changed, 28 insertions, 28 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index f753407..ebcdc7e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -97,7 +97,7 @@
 #endif
 
 #if defined(USE_NSS) || defined(OS_IOS)
-#include "net/ocsp/nss_ocsp.h"
+#include "net/cert_net/nss_ocsp.h"
 #endif
 
 #if defined(OS_ANDROID)
diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc
index 57091c7..5ac347b 100644
--- a/chromecast/browser/url_request_context_factory.cc
+++ b/chromecast/browser/url_request_context_factory.cc
@@ -16,13 +16,13 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/cert/cert_verifier.h"
+#include "net/cert_net/nss_ocsp.h"
 #include "net/cookies/cookie_store.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/http_stream_factory.h"
-#include "net/ocsp/nss_ocsp.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/next_proto.h"
 #include "net/ssl/channel_id_service.h"
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 93004bf..05f1106 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -197,8 +197,8 @@ component("net") {
       "cert/test_root_certs_nss.cc",
       "cert/x509_util_nss.cc",
       "cert/x509_util_nss.h",
-      "ocsp/nss_ocsp.cc",
-      "ocsp/nss_ocsp.h",
+      "cert_net/nss_ocsp.cc",
+      "cert_net/nss_ocsp.h",
       "quic/crypto/aead_base_decrypter_nss.cc",
       "quic/crypto/aead_base_encrypter_nss.cc",
       "quic/crypto/aes_128_gcm_12_decrypter_nss.cc",
@@ -342,8 +342,8 @@ component("net") {
       # keep them in that case.
       sources -= [
         "cert/test_root_certs_nss.cc",
-        "ocsp/nss_ocsp.cc",
-        "ocsp/nss_ocsp.h",
+        "cert_net/nss_ocsp.cc",
+        "cert_net/nss_ocsp.h",
       ]
     }
   }
@@ -474,8 +474,8 @@ component("net") {
       "cert/test_root_certs_nss.cc",
       "cert/x509_util_nss.cc",
       "cert/x509_util_nss.h",
-      "ocsp/nss_ocsp.cc",
-      "ocsp/nss_ocsp.h",
+      "cert_net/nss_ocsp.cc",
+      "cert_net/nss_ocsp.h",
       "proxy/proxy_resolver_mac.cc",
       "proxy/proxy_server_mac.cc",
     ]
@@ -1430,7 +1430,7 @@ if (!is_android && !is_win && !is_mac) {
     if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
       # Only include this test when on Posix and using NSS for
       # cert verification or on iOS (which also uses NSS for certs).
-      sources -= [ "ocsp/nss_ocsp_unittest.cc" ]
+      sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
     }
 
     if (!use_openssl_certs) {
diff --git a/net/ocsp/nss_ocsp.cc b/net/cert_net/nss_ocsp.cc
index 811b82d..290c319 100644
--- a/net/ocsp/nss_ocsp.cc
+++ b/net/cert_net/nss_ocsp.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/ocsp/nss_ocsp.h"
+#include "net/cert_net/nss_ocsp.h"
 
 #include <certt.h>
 #include <certdb.h>
diff --git a/net/ocsp/nss_ocsp.h b/net/cert_net/nss_ocsp.h
index fd84005..a422cb2 100644
--- a/net/ocsp/nss_ocsp.h
+++ b/net/cert_net/nss_ocsp.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_OCSP_NSS_OCSP_H_
-#define NET_OCSP_NSS_OCSP_H_
+#ifndef NET_CERT_NET_NSS_OCSP_H_
+#define NET_CERT_NET_NSS_OCSP_H_
 
 #include "net/base/net_export.h"
 
@@ -36,4 +36,4 @@ NET_EXPORT void SetURLRequestContextForNSSHttpIO(
 
 }  // namespace net
 
-#endif  // NET_OCSP_NSS_OCSP_H_
+#endif  // NET_CERT_NET_NSS_OCSP_H_
diff --git a/net/ocsp/nss_ocsp_unittest.cc b/net/cert_net/nss_ocsp_unittest.cc
index 745741e..155bcb2 100644
--- a/net/ocsp/nss_ocsp_unittest.cc
+++ b/net/cert_net/nss_ocsp_unittest.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/ocsp/nss_ocsp.h"
+#include "net/cert_net/nss_ocsp.h"
 
 #include <string>
 
diff --git a/net/net.gyp b/net/net.gyp
index 7ac62c8..5f57bca 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -233,7 +233,7 @@
           # Only include this test when on Posix and using NSS for
           # cert verification or on iOS (which also uses NSS for certs).
           'sources!': [
-            'ocsp/nss_ocsp_unittest.cc',
+            'cert_net/nss_ocsp_unittest.cc',
           ],
         }],
         [ 'use_openssl==1', {
diff --git a/net/net.gypi b/net/net.gypi
index d16b4f1..cbdc7e4 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -486,6 +486,8 @@
       'log/trace_net_log_observer.cc',
       'log/trace_net_log_observer.h',
       'disk_cache/simple/simple_histogram_macros.h' ,
+      'cert_net/nss_ocsp.cc',
+      'cert_net/nss_ocsp.h',
       'disk_cache/simple/simple_index.cc',
       'disk_cache/simple/simple_index.h',
       'disk_cache/simple/simple_index_delegate.h',
@@ -695,8 +697,6 @@
       'http/url_security_manager.h',
       'http/url_security_manager_posix.cc',
       'http/url_security_manager_win.cc',
-      'ocsp/nss_ocsp.cc',
-      'ocsp/nss_ocsp.h',
       'proxy/dhcp_proxy_script_adapter_fetcher_win.cc',
       'proxy/dhcp_proxy_script_adapter_fetcher_win.h',
       'proxy/dhcp_proxy_script_fetcher.cc',
@@ -1321,6 +1321,7 @@
       'cert/x509_util_openssl_unittest.cc',
       'cert/x509_util_unittest.cc',
       'cert_net/cert_net_fetcher_impl_unittest.cc',
+      'cert_net/nss_ocsp_unittest.cc',
       'cookies/canonical_cookie_unittest.cc',
       'cookies/cookie_constants_unittest.cc',
       'cookies/cookie_monster_unittest.cc',
@@ -1438,7 +1439,6 @@
       'log/net_log_unittest.h',
       'log/net_log_util_unittest.cc',
       'log/trace_net_log_observer_unittest.cc',
-      'ocsp/nss_ocsp_unittest.cc',
       'proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc',
       'proxy/dhcp_proxy_script_fetcher_factory_unittest.cc',
       'proxy/dhcp_proxy_script_fetcher_win_unittest.cc',
diff --git a/net/net_common.gypi b/net/net_common.gypi
index ebc8c73..7411efa 100644
--- a/net/net_common.gypi
+++ b/net/net_common.gypi
@@ -147,8 +147,8 @@
           'cert/x509_certificate_nss.cc',
           'cert/x509_util_nss.cc',
           'cert/x509_util_nss.h',
-          'ocsp/nss_ocsp.cc',
-          'ocsp/nss_ocsp.h',
+          'cert_net/nss_ocsp.cc',
+          'cert_net/nss_ocsp.h',
           'quic/crypto/aead_base_decrypter_nss.cc',
           'quic/crypto/aead_base_encrypter_nss.cc',
           'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
@@ -273,8 +273,8 @@
           'cert/nss_cert_database.h',
           'cert/test_root_certs_nss.cc',
           'cert/x509_certificate_nss.cc',
-          'ocsp/nss_ocsp.cc',
-          'ocsp/nss_ocsp.h',
+          'cert_net/nss_ocsp.cc',
+          'cert_net/nss_ocsp.h',
           'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
           'third_party/mozilla_security_manager/nsKeygenHandler.h',
           'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
@@ -417,10 +417,10 @@
         ['include', '^cert/test_root_certs_nss\\.cc$'],
         ['include', '^cert/x509_util_nss\\.cc$'],
         ['include', '^cert/x509_util_nss\\.h$'],
+        ['include', '^cert_net/nss_ocsp\\.cc$'],
+        ['include', '^cert_net/nss_ocsp\\.h$'],
         ['include', '^proxy/proxy_resolver_mac\\.cc$'],
         ['include', '^proxy/proxy_server_mac\\.cc$'],
-        ['include', '^ocsp/nss_ocsp\\.cc$'],
-        ['include', '^ocsp/nss_ocsp\\.h$'],
       ],
     }],
   ],
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index b7beae1..99320ef 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -100,9 +100,9 @@
 #include "net/cert/single_request_cert_verifier.h"
 #include "net/cert/x509_certificate_net_log_param.h"
 #include "net/cert/x509_util.h"
+#include "net/cert_net/nss_ocsp.h"
 #include "net/http/transport_security_state.h"
 #include "net/log/net_log.h"
-#include "net/ocsp/nss_ocsp.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/nss_ssl_util.h"
 #include "net/ssl/ssl_cert_request_info.h"
diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc
index ed8a103..ee05b86 100644
--- a/net/test/net_test_suite.cc
+++ b/net/test/net_test_suite.cc
@@ -11,7 +11,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS) || defined(OS_IOS)
-#include "net/ocsp/nss_ocsp.h"
+#include "net/cert_net/nss_ocsp.h"
 #endif
 
 class StaticReset : public ::testing::EmptyTestEventListener {
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index f08e382..60d6d01 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -33,7 +33,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS) || defined(OS_IOS)
-#include "net/ocsp/nss_ocsp.h"
+#include "net/cert_net/nss_ocsp.h"
 #endif
 
 namespace net {
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index ed04ba6..e86672c 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -45,6 +45,7 @@
 #include "net/cert/ev_root_ca_metadata.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/cert/test_root_certs.h"
+#include "net/cert_net/nss_ocsp.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store_test_helpers.h"
 #include "net/disk_cache/disk_cache.h"
@@ -60,7 +61,6 @@
 #include "net/log/capturing_net_log.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_unittest.h"
-#include "net/ocsp/nss_ocsp.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_cipher_suite_names.h"