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

Unified Diff: net/websockets/websocket_job_spdy2_unittest.cc

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing NET_EXPORT to *PortOnAddressList. Created 8 years, 8 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
Index: net/websockets/websocket_job_spdy2_unittest.cc
diff --git a/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc
index ebcc72f96ad81155e7cb508d4004ef32f7e6fceb..ca3f7e9817a7c74406d63d002f8c1c790eb6ade4 100644
--- a/net/websockets/websocket_job_spdy2_unittest.cc
+++ b/net/websockets/websocket_job_spdy2_unittest.cc
@@ -18,7 +18,6 @@
#include "net/base/mock_host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/ssl_config_service.h"
-#include "net/base/sys_addrinfo.h"
#include "net/base/test_completion_callback.h"
#include "net/base/transport_security_state.h"
#include "net/cookies/cookie_store.h"
@@ -406,16 +405,9 @@ class WebSocketJobSpdy2Test : public PlatformTest {
websocket_->InitSocketStream(socket_.get());
websocket_->set_context(context_.get());
- struct addrinfo addr;
- memset(&addr, 0, sizeof(struct addrinfo));
- addr.ai_family = AF_INET;
- addr.ai_addrlen = sizeof(struct sockaddr_in);
- struct sockaddr_in sa_in;
- memset(&sa_in, 0, sizeof(struct sockaddr_in));
- memcpy(&sa_in.sin_addr, "\x7f\0\0\1", 4);
- addr.ai_addr = reinterpret_cast<sockaddr*>(&sa_in);
- addr.ai_next = NULL;
- websocket_->addresses_ = AddressList::CreateByCopying(&addr);
+ IPAddressNumber ip;
+ ParseIPLiteralToNumber("127.0.0.1", &ip);
+ websocket_->addresses_ = AddressList::CreateFromIPAddress(ip, 0);
}
void SkipToConnecting() {
websocket_->state_ = WebSocketJob::CONNECTING;

Powered by Google App Engine
This is Rietveld 408576698