Commit fa6ce924 authored by davidben@chromium.org's avatar davidben@chromium.org

Fix a few stray net::'s in net/socket/

BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283642 0039d316-1c4b-4281-b951-d872f2087c98
parent 430e4b90
...@@ -132,7 +132,7 @@ int InitSocketPoolHelper(const GURL& request_url, ...@@ -132,7 +132,7 @@ int InitSocketPoolHelper(const GURL& request_url,
// should be the same for all connections, whereas version_max may // should be the same for all connections, whereas version_max may
// change for version fallbacks. // change for version fallbacks.
std::string prefix = "ssl/"; std::string prefix = "ssl/";
if (ssl_config_for_origin.version_max != net::kDefaultSSLVersionMax) { if (ssl_config_for_origin.version_max != kDefaultSSLVersionMax) {
switch (ssl_config_for_origin.version_max) { switch (ssl_config_for_origin.version_max) {
case SSL_PROTOCOL_VERSION_TLS1_2: case SSL_PROTOCOL_VERSION_TLS1_2:
prefix = "ssl(max:3.3)/"; prefix = "ssl(max:3.3)/";
......
...@@ -23,7 +23,7 @@ class NET_EXPORT ServerSocket { ...@@ -23,7 +23,7 @@ class NET_EXPORT ServerSocket {
// Binds the socket and starts listening. Destroy the socket to stop // Binds the socket and starts listening. Destroy the socket to stop
// listening. // listening.
virtual int Listen(const net::IPEndPoint& address, int backlog) = 0; virtual int Listen(const IPEndPoint& address, int backlog) = 0;
// Binds the socket with address and port, and starts listening. It expects // Binds the socket with address and port, and starts listening. It expects
// a valid IPv4 or IPv6 address. Otherwise, it returns ERR_ADDRESS_INVALID. // a valid IPv4 or IPv6 address. Otherwise, it returns ERR_ADDRESS_INVALID.
......
...@@ -1801,7 +1801,7 @@ int SSLClientSocketNSS::Core::DoWriteLoop(int result) { ...@@ -1801,7 +1801,7 @@ int SSLClientSocketNSS::Core::DoWriteLoop(int result) {
int SSLClientSocketNSS::Core::DoHandshake() { int SSLClientSocketNSS::Core::DoHandshake() {
DCHECK(OnNSSTaskRunner()); DCHECK(OnNSSTaskRunner());
int net_error = net::OK; int net_error = OK;
SECStatus rv = SSL_ForceHandshake(nss_fd_); SECStatus rv = SSL_ForceHandshake(nss_fd_);
// Note: this function may be called multiple times during the handshake, so // Note: this function may be called multiple times during the handshake, so
......
...@@ -85,13 +85,13 @@ bool LoadPrivateKeyOpenSSL( ...@@ -85,13 +85,13 @@ bool LoadPrivateKeyOpenSSL(
class SSLClientSocketOpenSSLClientAuthTest : public PlatformTest { class SSLClientSocketOpenSSLClientAuthTest : public PlatformTest {
public: public:
SSLClientSocketOpenSSLClientAuthTest() SSLClientSocketOpenSSLClientAuthTest()
: socket_factory_(net::ClientSocketFactory::GetDefaultFactory()), : socket_factory_(ClientSocketFactory::GetDefaultFactory()),
cert_verifier_(new net::MockCertVerifier), cert_verifier_(new MockCertVerifier),
transport_security_state_(new net::TransportSecurityState) { transport_security_state_(new TransportSecurityState) {
cert_verifier_->set_default_result(net::OK); cert_verifier_->set_default_result(OK);
context_.cert_verifier = cert_verifier_.get(); context_.cert_verifier = cert_verifier_.get();
context_.transport_security_state = transport_security_state_.get(); context_.transport_security_state = transport_security_state_.get();
key_store_ = net::OpenSSLClientKeyStore::GetInstance(); key_store_ = OpenSSLClientKeyStore::GetInstance();
} }
virtual ~SSLClientSocketOpenSSLClientAuthTest() { virtual ~SSLClientSocketOpenSSLClientAuthTest() {
......
This diff is collapsed.
...@@ -215,8 +215,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) { ...@@ -215,8 +215,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) {
size_t bytes_written = 0; size_t bytes_written = 0;
while (bytes_written < message.size()) { while (bytes_written < message.size()) {
scoped_refptr<net::IOBufferWithSize> write_buffer( scoped_refptr<IOBufferWithSize> write_buffer(
new net::IOBufferWithSize(message.size() - bytes_written)); new IOBufferWithSize(message.size() - bytes_written));
memmove(write_buffer->data(), message.data(), message.size()); memmove(write_buffer->data(), message.data(), message.size());
TestCompletionCallback write_callback; TestCompletionCallback write_callback;
...@@ -230,8 +230,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) { ...@@ -230,8 +230,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) {
size_t bytes_read = 0; size_t bytes_read = 0;
while (bytes_read < message.size()) { while (bytes_read < message.size()) {
scoped_refptr<net::IOBufferWithSize> read_buffer( scoped_refptr<IOBufferWithSize> read_buffer(
new net::IOBufferWithSize(message.size() - bytes_read)); new IOBufferWithSize(message.size() - bytes_read));
TestCompletionCallback read_callback; TestCompletionCallback read_callback;
int read_result = connecting_socket.Read( int read_result = connecting_socket.Read(
read_buffer.get(), read_buffer->size(), read_callback.callback()); read_buffer.get(), read_buffer->size(), read_callback.callback());
......
...@@ -32,7 +32,7 @@ namespace { ...@@ -32,7 +32,7 @@ namespace {
const int kMaxSockets = 32; const int kMaxSockets = 32;
const int kMaxSocketsPerGroup = 6; const int kMaxSocketsPerGroup = 6;
const net::RequestPriority kDefaultPriority = LOW; const RequestPriority kDefaultPriority = LOW;
class TransportClientSocketPoolTest : public testing::Test { class TransportClientSocketPoolTest : public testing::Test {
protected: protected:
......
...@@ -37,7 +37,7 @@ namespace { ...@@ -37,7 +37,7 @@ namespace {
const int kMaxSockets = 32; const int kMaxSockets = 32;
const int kMaxSocketsPerGroup = 6; const int kMaxSocketsPerGroup = 6;
const net::RequestPriority kDefaultPriority = LOW; const RequestPriority kDefaultPriority = LOW;
// RunLoop doesn't support this natively but it is easy to emulate. // RunLoop doesn't support this natively but it is easy to emulate.
void RunLoopForTimePeriod(base::TimeDelta period) { void RunLoopForTimePeriod(base::TimeDelta period) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment