Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / websockets / websocket_test_util.cc

diff --git a/src/net/websockets/websocket_test_util.cc b/src/net/websockets/websocket_test_util.cc
index bfa8980..60593f6 100644 (file)
--- a/src/net/websockets/websocket_test_util.cc
+++ b/src/net/websockets/websocket_test_util.cc
@@ -136,7 +136,7 @@ WebSocketDeterministicMockClientSocketFactoryMaker::AddSSLSocketDataProvider(
 }
 
 WebSocketTestURLRequestContextHost::WebSocketTestURLRequestContextHost()
-    : url_request_context_(true) {
+    : url_request_context_(true), url_request_context_initialized_(false) {
   url_request_context_.set_client_socket_factory(maker_.factory());
 }
 
@@ -154,9 +154,12 @@ void WebSocketTestURLRequestContextHost::AddSSLSocketDataProvider(
 
 TestURLRequestContext*
 WebSocketTestURLRequestContextHost::GetURLRequestContext() {
-  url_request_context_.Init();
-  // A Network Delegate is required to make the URLRequest::Delegate work.
-  url_request_context_.set_network_delegate(&network_delegate_);
+  if (!url_request_context_initialized_) {
+    url_request_context_.Init();
+    // A Network Delegate is required to make the URLRequest::Delegate work.
+    url_request_context_.set_network_delegate(&network_delegate_);
+    url_request_context_initialized_ = true;
+  }
   return &url_request_context_;
 }