16 files changed, 33 insertions, 33 deletions
diff --git a/net/base/default_origin_bound_cert_store.cc b/net/base/default_server_bound_cert_store.cc
index 3fd8c34..180792a 100644
--- a/net/base/default_origin_bound_cert_store.cc
+++ b/net/base/default_server_bound_cert_store.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/default_origin_bound_cert_store.h"
+#include "net/base/default_server_bound_cert_store.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
diff --git a/net/base/default_origin_bound_cert_store.h b/net/base/default_server_bound_cert_store.h
index 81a6f05..1ba7090d 100644
--- a/net/base/default_origin_bound_cert_store.h
+++ b/net/base/default_server_bound_cert_store.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_BASE_DEFAULT_ORIGIN_BOUND_CERT_STORE_H_
-#define NET_BASE_DEFAULT_ORIGIN_BOUND_CERT_STORE_H_
+#ifndef NET_BASE_DEFAULT_SERVER_BOUND_CERT_STORE_H_
+#define NET_BASE_DEFAULT_SERVER_BOUND_CERT_STORE_H_
 #pragma once
 
 #include <map>
@@ -15,7 +15,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "net/base/net_export.h"
-#include "net/base/origin_bound_cert_store.h"
+#include "net/base/server_bound_cert_store.h"
 
 class Task;
 
diff --git a/net/base/default_origin_bound_cert_store_unittest.cc b/net/base/default_server_bound_cert_store_unittest.cc
index 4e8628f..5fbe4e2 100644
--- a/net/base/default_origin_bound_cert_store_unittest.cc
+++ b/net/base/default_server_bound_cert_store_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/base/default_origin_bound_cert_store.h"
+#include "net/base/default_server_bound_cert_store.h"
 
 #include <map>
 #include <string>
diff --git a/net/base/origin_bound_cert_service.cc b/net/base/server_bound_cert_service.cc
index b380645..cd158c7 100644
--- a/net/base/origin_bound_cert_service.cc
+++ b/net/base/server_bound_cert_service.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/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 
 #include <algorithm>
 #include <limits>
@@ -21,8 +21,8 @@
 #include "crypto/ec_private_key.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
-#include "net/base/origin_bound_cert_store.h"
 #include "net/base/registry_controlled_domain.h"
+#include "net/base/server_bound_cert_store.h"
 #include "net/base/x509_certificate.h"
 #include "net/base/x509_util.h"
 
diff --git a/net/base/origin_bound_cert_service.h b/net/base/server_bound_cert_service.h
index 355379f..33b94fe 100644
--- a/net/base/origin_bound_cert_service.h
+++ b/net/base/server_bound_cert_service.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_BASE_ORIGIN_BOUND_CERT_SERVICE_H_
-#define NET_BASE_ORIGIN_BOUND_CERT_SERVICE_H_
+#ifndef NET_BASE_SERVER_BOUND_CERT_SERVICE_H_
+#define NET_BASE_SERVER_BOUND_CERT_SERVICE_H_
 #pragma once
 
 #include <map>
@@ -12,8 +12,8 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/time.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/base/ssl_client_cert_type.h"
@@ -132,4 +132,4 @@ class NET_EXPORT ServerBoundCertService
 
 }  // namespace net
 
-#endif  // NET_BASE_ORIGIN_BOUND_CERT_SERVICE_H_
+#endif  // NET_BASE_SERVER_BOUND_CERT_SERVICE_H_
diff --git a/net/base/origin_bound_cert_service_unittest.cc b/net/base/server_bound_cert_service_unittest.cc
index 64dd010..4804b70 100644
--- a/net/base/origin_bound_cert_service_unittest.cc
+++ b/net/base/server_bound_cert_service_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/base/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/asn1_util.h"
-#include "net/base/default_origin_bound_cert_store.h"
+#include "net/base/default_server_bound_cert_store.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/x509_certificate.h"
diff --git a/net/base/origin_bound_cert_store.cc b/net/base/server_bound_cert_store.cc
index cd4264a..faed54b 100644
--- a/net/base/origin_bound_cert_store.cc
+++ b/net/base/server_bound_cert_store.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/origin_bound_cert_store.h"
+#include "net/base/server_bound_cert_store.h"
 
 namespace net {
 
diff --git a/net/base/origin_bound_cert_store.h b/net/base/server_bound_cert_store.h
index 2ae22c5..02dfe52 100644
--- a/net/base/origin_bound_cert_store.h
+++ b/net/base/server_bound_cert_store.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_BASE_ORIGIN_BOUND_CERT_STORE_H_
-#define NET_BASE_ORIGIN_BOUND_CERT_STORE_H_
+#ifndef NET_BASE_SERVER_BOUND_CERT_STORE_H_
+#define NET_BASE_SERVER_BOUND_CERT_STORE_H_
 #pragma once
 
 #include <string>
@@ -114,4 +114,4 @@ class NET_EXPORT ServerBoundCertStore {
 
 }  // namespace net
 
-#endif  // NET_BASE_ORIGIN_BOUND_CERT_STORE_H_
+#endif  // NET_BASE_SERVER_BOUND_CERT_STORE_H_
diff --git a/net/net.gyp b/net/net.gyp
index 4fe5200..f9844a1 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -92,8 +92,8 @@
         'base/crypto_module_openssl.cc',
         'base/data_url.cc',
         'base/data_url.h',
-        'base/default_origin_bound_cert_store.cc',
-        'base/default_origin_bound_cert_store.h',
+        'base/default_server_bound_cert_store.cc',
+        'base/default_server_bound_cert_store.h',
         'base/directory_lister.cc',
         'base/directory_lister.h',
         'base/dns_reloader.cc',
@@ -202,10 +202,6 @@
         'base/openssl_memory_private_key_store.cc',
         'base/openssl_private_key_store.h',
         'base/openssl_private_key_store_android.cc',
-        'base/origin_bound_cert_service.cc',
-        'base/origin_bound_cert_service.h',
-        'base/origin_bound_cert_store.cc',
-        'base/origin_bound_cert_store.h',
         'base/pem_tokenizer.cc',
         'base/pem_tokenizer.h',
         'base/platform_mime_util.h',
@@ -224,6 +220,10 @@
         'base/sdch_filter.h',
         'base/sdch_manager.cc',
         'base/sdch_manager.h',
+        'base/server_bound_cert_service.cc',
+        'base/server_bound_cert_service.h',
+        'base/server_bound_cert_store.cc',
+        'base/server_bound_cert_store.h',
         'base/single_request_cert_verifier.cc',
         'base/single_request_cert_verifier.h',
         'base/single_request_host_resolver.cc',
@@ -1047,7 +1047,7 @@
         'base/cert_database_nss_unittest.cc',
         'base/crl_set_unittest.cc',
         'base/data_url_unittest.cc',
-        'base/default_origin_bound_cert_store_unittest.cc',
+        'base/default_server_bound_cert_store_unittest.cc',
         'base/directory_lister_unittest.cc',
         'base/dnssec_unittest.cc',
         'base/dns_util_unittest.cc',
@@ -1077,13 +1077,13 @@
         'base/net_util_unittest.cc',
         'base/network_change_notifier_linux_unittest.cc',
         'base/network_change_notifier_win_unittest.cc',
-        'base/origin_bound_cert_service_unittest.cc',
         'base/pem_tokenizer_unittest.cc',
         'base/prioritized_dispatcher_unittest.cc',
         'base/priority_queue_unittest.cc',
         'base/registry_controlled_domain_unittest.cc',
         'base/run_all_unittests.cc',
         'base/sdch_filter_unittest.cc',
+        'base/server_bound_cert_service_unittest.cc',
         'base/single_request_host_resolver_unittest.cc',
         'base/ssl_cipher_suite_names_unittest.cc',
         'base/ssl_client_auth_cache_unittest.cc',
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 49343d1..0860276 100644
--- a/net/socket/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -25,7 +25,7 @@
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/nss_memio.h"
-#include "net/base/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/x509_certificate.h"
 #include "net/socket/ssl_client_socket.h"
diff --git a/net/spdy/spdy_http_stream_spdy2_unittest.cc b/net/spdy/spdy_http_stream_spdy2_unittest.cc
index b45de55..c002e33 100644
--- a/net/spdy/spdy_http_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy2_unittest.cc
@@ -8,7 +8,7 @@
 #include "crypto/ec_signature_creator.h"
 #include "crypto/signature_creator.h"
 #include "net/base/asn1_util.h"
-#include "net/base/default_origin_bound_cert_store.h"
+#include "net/base/default_server_bound_cert_store.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/spdy/spdy_session.h"
diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc
index 92ebf4a..c130ad5 100644
--- a/net/spdy/spdy_http_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc
@@ -8,7 +8,7 @@
 #include "crypto/ec_signature_creator.h"
 #include "crypto/signature_creator.h"
 #include "net/base/asn1_util.h"
-#include "net/base/default_origin_bound_cert_store.h"
+#include "net/base/default_server_bound_cert_store.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/spdy/spdy_session.h"
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 0fdc5ef..7767e4f 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -26,7 +26,7 @@
 #include "net/base/connection_type_histograms.h"
 #include "net/base/net_log.h"
 #include "net/base/net_util.h"
-#include "net/base/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/spdy/spdy_frame_builder.h"
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
index 4741ad4..84e9fbd 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -18,7 +18,7 @@
 #include "net/base/io_buffer.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
-#include "net/base/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 #include "net/base/ssl_client_cert_type.h"
 #include "net/base/upload_data.h"
 #include "net/socket/ssl_client_socket.h"
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc
index 2c9f816..ed7950e 100644
--- a/net/url_request/url_request_context_storage.cc
+++ b/net/url_request/url_request_context_storage.cc
@@ -9,7 +9,7 @@
 #include "net/base/host_resolver.h"
 #include "net/base/net_log.h"
 #include "net/base/network_delegate.h"
-#include "net/base/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 #include "net/cookies/cookie_store.h"
 #include "net/ftp/ftp_transaction_factory.h"
 #include "net/http/http_auth_handler_factory.h"
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 2ed65bd..5fc4f72 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -9,9 +9,9 @@
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "net/base/cert_verifier.h"
-#include "net/base/default_origin_bound_cert_store.h"
+#include "net/base/default_server_bound_cert_store.h"
 #include "net/base/host_port_pair.h"
-#include "net/base/origin_bound_cert_service.h"
+#include "net/base/server_bound_cert_service.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/url_request/url_request_job_factory.h"