diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:27:09 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:27:09 +0000 |
| commit | ef2bf421b04de3134cd7c02aac40a5565ef24dd9 (patch) | |
| tree | 5bf90cca0bd015c23e843614ebf2e9f99cb8cd99 /chrome/browser/sync/glue/http_bridge.cc | |
| parent | 280e9b5d4b2fb0fe14824e526521710a658bce56 (diff) | |
| download | chromium_src-ef2bf421b04de3134cd7c02aac40a5565ef24dd9.zip chromium_src-ef2bf421b04de3134cd7c02aac40a5565ef24dd9.tar.gz chromium_src-ef2bf421b04de3134cd7c02aac40a5565ef24dd9.tar.bz2 | |
Stop refcounting URLRequestContext.
While doing so, fix a few issues with the code like ordering of URLRequestContext to ensure correct destruction order. Also fix const correctness in some places.
BUG=58859
TEST=none
TBR=willchan
Review URL: https://chromiumcodereview.appspot.com/10299002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/glue/http_bridge.cc')
| -rw-r--r-- | chrome/browser/sync/glue/http_bridge.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc index dc01ebf..e7a217f 100644 --- a/chrome/browser/sync/glue/http_bridge.cc +++ b/chrome/browser/sync/glue/http_bridge.cc @@ -35,10 +35,10 @@ HttpBridge::RequestContextGetter::~RequestContextGetter() {} net::URLRequestContext* HttpBridge::RequestContextGetter::GetURLRequestContext() { // Lazily create the context. - if (!context_) { + if (!context_.get()) { net::URLRequestContext* baseline_context = baseline_context_getter_->GetURLRequestContext(); - context_ = new RequestContext(baseline_context); + context_.reset(new RequestContext(baseline_context)); baseline_context_getter_ = NULL; } @@ -46,7 +46,7 @@ HttpBridge::RequestContextGetter::GetURLRequestContext() { if (is_user_agent_set()) context_->set_user_agent(user_agent_); - return context_; + return context_.get(); } scoped_refptr<base::MessageLoopProxy> |