Change Origin bound certs -> Domain bound certs.

net/spdy/spdy_http_stream_spdy2_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 "net/spdy/spdy_http_stream.h"
 
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "crypto/signature_creator.h"
 #include "net/base/asn1_util.h"
@@ skipping 45 matching lines @@
                                 transport_params_,
                                 MEDIUM,
                                 callback.callback(),
                                 http_session_->GetTransportSocketPool(),
                                 BoundNetLog()));
     EXPECT_EQ(OK, callback.WaitForResult());
     return session_->InitializeWithSocket(connection.release(), false, OK);
   }
 
   void TestSendCredentials(
-    OriginBoundCertService* obc_service,
+    ServerBoundCertService* sbc_service,

[wtc, 2012/03/15 23:46:38]

Let's rename sbc_service to server_bound_cert_service.

[mattm, 2012/03/16 22:22:00]

Done.

     const std::string& cert,
     const std::string& proof,
     SSLClientCertType type);
 
   SpdySessionDependencies session_deps_;
   scoped_ptr<OrderedSocketData> data_;
   scoped_refptr<HttpNetworkSession> http_session_;
   scoped_refptr<SpdySession> session_;
   scoped_refptr<TransportSocketParams> transport_params_;
 };
@@ skipping 163 matching lines @@
 
   // Because we abandoned the stream, we don't expect to find a session in the
   // pool anymore.
   EXPECT_FALSE(http_session_->spdy_session_pool()->HasSession(pair));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 namespace {
 
-void GetECOriginBoundCertAndProof(const std::string& origin,
-                                OriginBoundCertService* obc_service,
+void GetECServerBoundCertAndProof(const std::string& origin,
+                                ServerBoundCertService* sbc_service,
                                 std::string* cert,
                                 std::string* proof) {
   TestCompletionCallback callback;
   std::vector<uint8> requested_cert_types;
   requested_cert_types.push_back(CLIENT_CERT_ECDSA_SIGN);
   SSLClientCertType cert_type;
   std::string key;
-  OriginBoundCertService::RequestHandle request_handle;
-  int rv = obc_service->GetOriginBoundCert(origin, requested_cert_types,
+  ServerBoundCertService::RequestHandle request_handle;
+  int rv = sbc_service->GetDomainBoundCert(origin, requested_cert_types,
                                            &cert_type, &key, cert,
                                            callback.callback(),
                                            &request_handle);
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
   EXPECT_EQ(CLIENT_CERT_ECDSA_SIGN, cert_type);
 
   unsigned char secret[32];
   memset(secret, 'A', arraysize(secret));
 
   // Convert the key string into a vector<unit8>
   std::vector<uint8> key_data(key.begin(), key.end());
 
   base::StringPiece spki_piece;
   ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(*cert, &spki_piece));
   std::vector<uint8> spki(spki_piece.data(),
                           spki_piece.data() + spki_piece.size());
 
   std::vector<uint8> proof_data;
   scoped_ptr<crypto::ECPrivateKey> private_key(
       crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-          OriginBoundCertService::kEPKIPassword, key_data, spki));
+          ServerBoundCertService::kEPKIPassword, key_data, spki));
   scoped_ptr<crypto::ECSignatureCreator> creator(
       crypto::ECSignatureCreator::Create(private_key.get()));
   creator->Sign(secret, arraysize(secret), &proof_data);
   proof->assign(proof_data.begin(), proof_data.end());
 }
 
 }  // namespace
 
-// TODO(rch): When openssl supports origin bound certifictes, this
+// TODO(rch): When openssl supports server bound certifictes, this
 // guard can be removed
 #if !defined(USE_OPENSSL)
-// Test that if we request a resource for a new origin on a session that
-// used origin bound certificates, that we send a CREDENTIAL frame for
-// the new origin before we send the new request.
+// Test that if we request a resource for a new domain on a session that
+// used domain bound certificates, that we send a CREDENTIAL frame for
+// the new domain before we send the new request.
 void SpdyHttpStreamSpdy2Test::TestSendCredentials(
-    OriginBoundCertService* obc_service,
+    ServerBoundCertService* sbc_service,
     const std::string& cert,
     const std::string& proof,
     SSLClientCertType type) {
   EnableCompression(false);
 
   spdy::SpdyCredential cred;
   cred.slot = 1;
   cred.proof = proof;
   cred.certs.push_back(cert);
 
@@ skipping 18 matching lines @@
   HostPortPair host_port_pair("www.google.com", 80);
   HostPortProxyPair pair(host_port_pair, ProxyServer::Direct());
 
   DeterministicMockClientSocketFactory* socket_factory =
       session_deps_.deterministic_socket_factory.get();
   scoped_refptr<DeterministicSocketData> data(
       new DeterministicSocketData(reads, arraysize(reads),
                                   writes, arraysize(writes)));
   socket_factory->AddSocketDataProvider(data.get());
   SSLSocketDataProvider ssl(SYNCHRONOUS, OK);
-  ssl.origin_bound_cert_type = type;
-  ssl.origin_bound_cert_service = obc_service;
+  ssl.domain_bound_cert_type = type;
+  ssl.server_bound_cert_service = sbc_service;
   ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY3;
   socket_factory->AddSSLSocketDataProvider(&ssl);
   http_session_ = SpdySessionDependencies::SpdyCreateSessionDeterministic(
       &session_deps_);
   session_ = http_session_->spdy_session_pool()->Get(pair, BoundNetLog());
   transport_params_ = new TransportSocketParams(host_port_pair,
                                                 MEDIUM, false, false);
   TestCompletionCallback callback;
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   SSLConfig ssl_config;
@@ skipping 102 matching lines @@
  private:
    DISALLOW_COPY_AND_ASSIGN(MockECSignatureCreatorFactory);
 };
 
 #endif  // !defined(USE_OPENSSL)
 
 // TODO(willchan): Write a longer test for SpdyStream that exercises all
 // methods.
 
 }  // namespace net