Index: net/url_request/url_request_test_util.cc |
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc |
index 7a1bc7ff276a0004a9a6e708c1c99504d3d32e7c..b81996c25bf6cf738213a6f3b1e95c8c0300db69 100644 |
--- a/net/url_request/url_request_test_util.cc |
+++ b/net/url_request/url_request_test_util.cc |
@@ -162,11 +162,14 @@ void TestURLRequestContext::Init() { |
TestURLRequest::TestURLRequest(const GURL& url, Delegate* delegate) |
- : net::URLRequest(url, delegate) { |
- set_context(new TestURLRequestContext()); |
+ : net::URLRequest(url, delegate), |
+ context_(new TestURLRequestContext) { |
+ set_context(context_.get()); |
} |
-TestURLRequest::~TestURLRequest() {} |
+TestURLRequest::~TestURLRequest() { |
+ set_context(NULL); |
+} |
TestURLRequestContextGetter::TestURLRequestContextGetter( |
const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy) |
@@ -177,8 +180,8 @@ TestURLRequestContextGetter::TestURLRequestContextGetter( |
TestURLRequestContextGetter::~TestURLRequestContextGetter() {} |
TestURLRequestContext* TestURLRequestContextGetter::GetURLRequestContext() { |
- if (!context_) |
- context_ = new TestURLRequestContext(); |
+ if (!context_.get()) |
+ context_.reset(new TestURLRequestContext); |
return context_.get(); |
} |