Stop refcounting URLRequestContext.

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 127 matching lines @@
     : sb_service_(sb_service),
       io_message_loop_proxy_(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)) {
 }
 
 SafeBrowsingURLRequestContextGetter::~SafeBrowsingURLRequestContextGetter() {}
 
 net::URLRequestContext*
 SafeBrowsingURLRequestContextGetter::GetURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(sb_service_->url_request_context_);
+  DCHECK(sb_service_->url_request_context_.get());
 
-  return sb_service_->url_request_context_;
+  return sb_service_->url_request_context_.get();
 }
 
 scoped_refptr<base::MessageLoopProxy>
 SafeBrowsingURLRequestContextGetter::GetIOMessageLoopProxy() const {
   return io_message_loop_proxy_;
 }
 
 // static
 SafeBrowsingServiceFactory* SafeBrowsingService::factory_ = NULL;
 
@@ skipping 446 matching lines @@
 void SafeBrowsingService::InitURLRequestContextOnIOThread(
     net::URLRequestContextGetter* system_url_request_context_getter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!url_request_context_.get());
 
   scoped_refptr<net::CookieStore> cookie_store = new net::CookieMonster(
       new SQLitePersistentCookieStore(
           FilePath(BaseFilename().value() + kCookiesFile), false),
       NULL);
 
-  url_request_context_ = new SafeBrowsingURLRequestContext;
+  url_request_context_.reset(new SafeBrowsingURLRequestContext);
   // |system_url_request_context_getter| may be NULL during tests.
   if (system_url_request_context_getter)
     url_request_context_->CopyFrom(
         system_url_request_context_getter->GetURLRequestContext());
   url_request_context_->set_cookie_store(cookie_store);
 }
 
 void SafeBrowsingService::DestroyURLRequestContextOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   url_request_context_->AssertNoURLRequests();
 
   // Need to do the CheckForLeaks on IOThread instead of in ShutDown where
   // url_request_context_getter_ is cleared,  since the URLRequestContextGetter
   // will PostTask to IOTread to delete itself.
   using base::debug::LeakTracker;
   LeakTracker<SafeBrowsingURLRequestContextGetter>::CheckForLeaks();
 
-  DCHECK(url_request_context_.get());
-  url_request_context_ = NULL;
+  url_request_context_.reset();
 }
 
 void SafeBrowsingService::StartOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (enabled_)
     return;
   DCHECK(!safe_browsing_thread_.get());
   safe_browsing_thread_.reset(new base::Thread("Chrome_SafeBrowsingThread"));
   if (!safe_browsing_thread_->Start())
     return;
@@ skipping 778 matching lines @@
     Stop();
 
   if (csd_service_.get())
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_.get()) {
     download_service_->SetEnabled(
         enable && !CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableImprovedDownloadProtection));
   }
 }