Use automatic memory management for URLRequestContext's members....

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lock.h"
@@ skipping 92 matching lines @@
 // A context for URLRequests issued relative to this profile.
 class ProfileImpl::RequestContext : public URLRequestContext,
                                     public NotificationObserver {
  public:
   // |cookie_store_path| is the local disk path at which the cookie store
   // is persisted.
   RequestContext(const std::wstring& cookie_store_path,
                  const std::wstring& disk_cache_path,
                  PrefService* prefs)
       : prefs_(prefs) {
-    cookie_store_ = NULL;
 
     // setup user agent
     user_agent_ = webkit_glue::GetUserAgent();
     // set up Accept-Language and Accept-Charset header values
     // TODO(jungshik) : This may slow down http requests. Perhaps,
     // we have to come up with a better way to set up these values.
     accept_language_ = WideToASCII(prefs_->GetString(prefs::kAcceptLanguages));
     accept_charset_ = WideToASCII(prefs_->GetString(prefs::kDefaultCharset));
     accept_charset_ += ",*,utf-8";
 
     CommandLine command_line;
 
     scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo(command_line));
     proxy_service_ = net::ProxyService::Create(proxy_info.get());
 
     net::HttpCache* cache =
         new net::HttpCache(proxy_service_, disk_cache_path, 0);
 
     bool record_mode = chrome::kRecordModeEnabled &&
                        CommandLine().HasSwitch(switches::kRecordMode);
     bool playback_mode = CommandLine().HasSwitch(switches::kPlaybackMode);
 
     if (record_mode || playback_mode) {
       // Don't use existing cookies and use an in-memory store.
-      cookie_store_ = new net::CookieMonster();
+      cookie_store_.reset(new net::CookieMonster());
       cache->set_mode(
           record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
     }
-    http_transaction_factory_ = cache;
+    http_transaction_factory_.reset(cache);
 
     // setup cookie store
-    if (!cookie_store_) {
+    if (!cookie_store_.get()) {
       DCHECK(!cookie_store_path.empty());
       cookie_db_.reset(new SQLitePersistentCookieStore(
           cookie_store_path, g_browser_process->db_thread()->message_loop()));
-      cookie_store_ = new net::CookieMonster(cookie_db_.get());
+      cookie_store_.reset(new net::CookieMonster(cookie_db_.get()));
     }
 
     cookie_policy_.SetType(net::CookiePolicy::FromInt(
         prefs_->GetInteger(prefs::kCookieBehavior)));
 
     // The first request context to be created is the one for the default
     // profile - at least until we support multiple profiles.
     if (!default_request_context_)
       default_request_context_ = this;
     NotificationService::current()->Notify(
@@ skipping 49 matching lines @@
   }
 
   void OnCookiePolicyChange(net::CookiePolicy::Type type) {
     DCHECK(MessageLoop::current() ==
            ChromeThread::GetMessageLoop(ChromeThread::IO));
     cookie_policy_.SetType(type);
   }
 
   virtual ~RequestContext() {
     DCHECK(NULL == prefs_);
-    delete cookie_store_;
-    delete http_transaction_factory_;
-    delete proxy_service_;
-
     if (default_request_context_ == this)
       default_request_context_ = NULL;
   }
 
  private:
   scoped_ptr<SQLitePersistentCookieStore> cookie_db_;
   PrefService* prefs_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 14 matching lines @@
   explicit OffTheRecordRequestContext(Profile* profile) {
     DCHECK(!profile->IsOffTheRecord());
     prefs_ = profile->GetPrefs();
     DCHECK(prefs_);
 
     // The OffTheRecordRequestContext is owned by the OffTheRecordProfileImpl
     // which is itself owned by the original profile. We reference the original
     // context to make sure it doesn't go away when we delete the object graph.
     original_context_ = profile->GetRequestContext();
 
-    // Share the same proxy service as the original profile. This proxy
-    // service's lifespan is dependent on the lifespan of the original profile,
-    // which we reference (see above).
+    // Share the same proxy service as the original profile (adds a reference).
     proxy_service_ = original_context_->proxy_service();
 
-    http_transaction_factory_ = new net::HttpCache(proxy_service_, 0);
-    cookie_store_ = new net::CookieMonster;
+    http_transaction_factory_.reset(
+        new net::HttpCache(proxy_service_, 0));
+    cookie_store_.reset(new net::CookieMonster);
     cookie_policy_.SetType(net::CookiePolicy::FromInt(
         prefs_->GetInteger(prefs::kCookieBehavior)));
     user_agent_ = original_context_->user_agent();
     accept_language_ = original_context_->accept_language();
     accept_charset_ = original_context_->accept_charset();
     is_off_the_record_ = true;
 
     // Register for notifications about prefs.
     prefs_->AddPrefObserver(prefs::kAcceptLanguages, this);
     prefs_->AddPrefObserver(prefs::kCookieBehavior, this);
@@ skipping 45 matching lines @@
   }
 
   void OnCookiePolicyChange(net::CookiePolicy::Type type) {
     DCHECK(MessageLoop::current() ==
            ChromeThread::GetMessageLoop(ChromeThread::IO));
     cookie_policy_.SetType(type);
   }
 
   virtual ~OffTheRecordRequestContext() {
     DCHECK(NULL == prefs_);
-    delete cookie_store_;
-    delete http_transaction_factory_;
-    // NOTE: do not delete |proxy_service_| as is owned by the original profile.
-   
     // The OffTheRecordRequestContext simply act as a proxy to the real context.
     // There is nothing else to delete.
   }
 
  private:
   // The original (non off the record) URLRequestContext.
   scoped_refptr<URLRequestContext> original_context_;
   PrefService* prefs_;
 
   DISALLOW_EVIL_CONSTRUCTORS(OffTheRecordRequestContext);
@@ skipping 664 matching lines @@
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   if (!personalization_.get())
     personalization_.reset(
         Personalization::CreateProfilePersonalization(this));
   return personalization_.get();
 }
 #endif