| Index: mojo/services/network/http_server_apptest.cc
|
| diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
|
| index f91b7e47563db8284d0947fac535d8889c944040..ce93f047d1465daa9b4bf5ef66c744d47d5a864a 100644
|
| --- a/mojo/services/network/http_server_apptest.cc
|
| +++ b/mojo/services/network/http_server_apptest.cc
|
| @@ -23,6 +23,7 @@
|
| #include "mojo/services/network/public/interfaces/net_address.mojom.h"
|
| #include "mojo/services/network/public/interfaces/network_service.mojom.h"
|
| #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
|
| +#include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
|
| #include "net/base/io_buffer.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/test_completion_callback.h"
|
| @@ -556,6 +557,7 @@ class HttpServerAppTest : public test::ApplicationTestBase {
|
| scoped_ptr<ApplicationConnection> connection =
|
| application_impl()->ConnectToApplication(request.Pass());
|
| connection->ConnectToService(&network_service_);
|
| + connection->ConnectToService(&web_socket_factory_);
|
| }
|
|
|
| void CreateHttpServer(HttpServerDelegatePtr delegate,
|
| @@ -571,6 +573,7 @@ class HttpServerAppTest : public test::ApplicationTestBase {
|
| }
|
|
|
| NetworkServicePtr network_service_;
|
| + WebSocketFactoryPtr web_socket_factory_;
|
|
|
| private:
|
| base::MessageLoop message_loop_;
|
| @@ -657,7 +660,7 @@ TEST_F(HttpServerAppTest, WebSocket) {
|
| CreateHttpServer(server_delegate_ptr.Pass(), &bound_to);
|
|
|
| WebSocketPtr web_socket_ptr;
|
| - network_service_->CreateWebSocket(GetProxy(&web_socket_ptr));
|
| + web_socket_factory_->CreateWebSocket(GetProxy(&web_socket_ptr));
|
| WebSocketClientImpl socket_0;
|
| socket_0.Connect(
|
| web_socket_ptr.Pass(),
|
|
|