Index: content/browser/devtools/devtools_http_handler_unittest.cc |
diff --git a/content/browser/devtools/devtools_http_handler_unittest.cc b/content/browser/devtools/devtools_http_handler_unittest.cc |
index 88710924c2a5856916619796c4ccacab9b0415e1..a8164b017410ace15f7b52811113ce43eeea5e05 100644 |
--- a/content/browser/devtools/devtools_http_handler_unittest.cc |
+++ b/content/browser/devtools/devtools_http_handler_unittest.cc |
@@ -13,7 +13,7 @@ |
#include "content/public/browser/devtools_target.h" |
#include "net/base/ip_endpoint.h" |
#include "net/base/net_errors.h" |
-#include "net/socket/stream_listen_socket.h" |
+#include "net/socket/server_socket.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace content { |
@@ -23,49 +23,49 @@ const int kDummyPort = 4321; |
const base::FilePath::CharType kDevToolsActivePortFileName[] = |
FILE_PATH_LITERAL("DevToolsActivePort"); |
-using net::StreamListenSocket; |
- |
-class DummyListenSocket : public StreamListenSocket, |
- public StreamListenSocket::Delegate { |
+class DummyServerSocket : public net::ServerSocket { |
public: |
- DummyListenSocket() |
- : StreamListenSocket(net::kInvalidSocket, this) {} |
+ DummyServerSocket() {} |
- // StreamListenSocket::Delegate "implementation" |
- virtual void DidAccept(StreamListenSocket* server, |
- scoped_ptr<StreamListenSocket> connection) OVERRIDE {} |
- virtual void DidRead(StreamListenSocket* connection, |
- const char* data, |
- int len) OVERRIDE {} |
- virtual void DidClose(StreamListenSocket* sock) OVERRIDE {} |
- protected: |
- virtual ~DummyListenSocket() {} |
- virtual void Accept() OVERRIDE {} |
- virtual int GetLocalAddress(net::IPEndPoint* address) OVERRIDE { |
+ // net::ServerSocket "implementation" |
+ virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE { |
+ return net::OK; |
+ } |
+ virtual int ListenWithAddressAndPort(const std::string& ip_address, |
+ int port, |
+ int backlog) OVERRIDE { |
+ return net::OK; |
+ } |
+ virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE { |
net::IPAddressNumber number; |
EXPECT_TRUE(net::ParseIPLiteralToNumber("127.0.0.1", &number)); |
*address = net::IPEndPoint(number, kDummyPort); |
return net::OK; |
} |
+ virtual int Accept(scoped_ptr<net::StreamSocket>* socket, |
+ const net::CompletionCallback& callback) OVERRIDE { |
+ return net::ERR_IO_PENDING; |
+ } |
}; |
-class DummyListenSocketFactory : public net::StreamListenSocketFactory { |
+class DummyServerSocketFactory |
+ : public DevToolsHttpHandler::ServerSocketFactory { |
public: |
- DummyListenSocketFactory( |
- base::Closure quit_closure_1, base::Closure quit_closure_2) |
- : quit_closure_1_(quit_closure_1), quit_closure_2_(quit_closure_2) {} |
- virtual ~DummyListenSocketFactory() { |
+ DummyServerSocketFactory(base::Closure quit_closure_1, |
+ base::Closure quit_closure_2) |
+ : DevToolsHttpHandler::ServerSocketFactory("", 0, 0), |
+ quit_closure_1_(quit_closure_1), |
+ quit_closure_2_(quit_closure_2) {} |
+ virtual ~DummyServerSocketFactory() { |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, quit_closure_2_); |
} |
- |
- virtual scoped_ptr<StreamListenSocket> CreateAndListen( |
- StreamListenSocket::Delegate* delegate) const OVERRIDE { |
+ private: |
+ virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE { |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, quit_closure_1_); |
- return scoped_ptr<net::StreamListenSocket>(new DummyListenSocket()); |
+ return scoped_ptr<net::ServerSocket>(new DummyServerSocket()); |
} |
- private: |
base::Closure quit_closure_1_; |
base::Closure quit_closure_2_; |
}; |
@@ -87,8 +87,8 @@ class DummyDelegate : public DevToolsHttpHandlerDelegate { |
callback.Run(TargetList()); |
} |
virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering( |
- net::StreamListenSocket::Delegate* delegate, |
- std::string* name) OVERRIDE { |
+ net::StreamListenSocket::Delegate* delegate, |
+ std::string* name) OVERRIDE { |
return scoped_ptr<net::StreamListenSocket>(); |
} |
}; |
@@ -116,13 +116,14 @@ class DevToolsHttpHandlerTest : public testing::Test { |
TEST_F(DevToolsHttpHandlerTest, TestStartStop) { |
base::RunLoop run_loop, run_loop_2; |
+ scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory( |
+ new DummyServerSocketFactory(run_loop.QuitClosure(), |
+ run_loop_2.QuitClosure())); |
content::DevToolsHttpHandler* devtools_http_handler_ = |
- content::DevToolsHttpHandler::Start( |
- new DummyListenSocketFactory(run_loop.QuitClosure(), |
- run_loop_2.QuitClosure()), |
- std::string(), |
- new DummyDelegate(), |
- base::FilePath()); |
+ content::DevToolsHttpHandler::Start(factory.Pass(), |
+ std::string(), |
+ new DummyDelegate(), |
+ base::FilePath()); |
// Our dummy socket factory will post a quit message once the server will |
// become ready. |
run_loop.Run(); |