Stop refcounting URLRequestContext.

chrome/browser/net/chrome_url_request_context.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/net/chrome_url_request_context.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 12 matching lines @@
 #include "net/http/http_util.h"
 
 using content::BrowserThread;
 
 class ChromeURLRequestContextFactory {
  public:
   ChromeURLRequestContextFactory() {}
   virtual ~ChromeURLRequestContextFactory() {}
 
   // Called to create a new instance (will only be called once).
-  virtual scoped_refptr<ChromeURLRequestContext> Create() = 0;
+  virtual ChromeURLRequestContext* Create() = 0;
 
  protected:
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextFactory);
 };
 
 namespace {
 
 // ----------------------------------------------------------------------------
 // Helper factories
 // ----------------------------------------------------------------------------
 
 // Factory that creates the main ChromeURLRequestContext.
 class FactoryForMain : public ChromeURLRequestContextFactory {
  public:
   explicit FactoryForMain(const ProfileIOData* profile_io_data)
       : profile_io_data_(profile_io_data) {}
 
-  virtual scoped_refptr<ChromeURLRequestContext> Create() {
+  virtual ChromeURLRequestContext* Create() {

[eroman, 2012/05/04 04:27:02]

can you add OVERRIDE?

     return profile_io_data_->GetMainRequestContext();
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
 };
 
 // Factory that creates the ChromeURLRequestContext for extensions.
 class FactoryForExtensions : public ChromeURLRequestContextFactory {
  public:
   explicit FactoryForExtensions(const ProfileIOData* profile_io_data)
       : profile_io_data_(profile_io_data) {}
 
-  virtual scoped_refptr<ChromeURLRequestContext> Create() {
+  virtual ChromeURLRequestContext* Create() {

[eroman, 2012/05/04 04:27:02]

can you add OVERRIDE?

     return profile_io_data_->GetExtensionsRequestContext();
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
 };
 
 // Factory that creates the ChromeURLRequestContext for a given isolated app.
 class FactoryForIsolatedApp : public ChromeURLRequestContextFactory {
  public:
   FactoryForIsolatedApp(const ProfileIOData* profile_io_data,
                         const std::string& app_id,
                         ChromeURLRequestContextGetter* main_context)
       : profile_io_data_(profile_io_data),
         app_id_(app_id),
         main_request_context_getter_(main_context) {}
 
-  virtual scoped_refptr<ChromeURLRequestContext> Create() {
+  virtual ChromeURLRequestContext* Create() {

[eroman, 2012/05/04 04:27:02]

can you add OVERRIDE?

     // We will copy most of the state from the main request context.
     return profile_io_data_->GetIsolatedAppRequestContext(
         main_request_context_getter_->GetIOContext(), app_id_);
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
   const std::string app_id_;
   scoped_refptr<ChromeURLRequestContextGetter>
       main_request_context_getter_;
 };
 
 // Factory that creates the ChromeURLRequestContext for media.
 class FactoryForMedia : public ChromeURLRequestContextFactory {
  public:
   explicit FactoryForMedia(const ProfileIOData* profile_io_data)
       : profile_io_data_(profile_io_data) {
   }
 
-  virtual scoped_refptr<ChromeURLRequestContext> Create() {
+  virtual ChromeURLRequestContext* Create() {

[eroman, 2012/05/04 04:27:02]

can you add OVERRIDE?

     return profile_io_data_->GetMediaRequestContext();
   }
 
  private:
   const ProfileIOData* const profile_io_data_;
 };
 
 }  // namespace
 
 // ----------------------------------------------------------------------------
@@ skipping 194 matching lines @@
 
   if (cookie_monster)
     cookie_monster->SetClearPersistentStoreOnExit(clear_site_data);
 }
 
 // ----------------------------------------------------------------------------
 // ChromeURLRequestContext
 // ----------------------------------------------------------------------------
 
 ChromeURLRequestContext::ChromeURLRequestContext()
-    : is_incognito_(false) {
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      is_incognito_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
+ChromeURLRequestContext::~ChromeURLRequestContext() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+}
+
 void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {
   URLRequestContext::CopyFrom(other);
 
   // Copy ChromeURLRequestContext parameters.
   // ChromeURLDataManagerBackend is unique per context.
   set_is_incognito(other->is_incognito());
 }
 
 ChromeURLDataManagerBackend*
 ChromeURLRequestContext::chrome_url_data_manager_backend() const {
     return chrome_url_data_manager_backend_;
 }
 
 void ChromeURLRequestContext::set_chrome_url_data_manager_backend(
         ChromeURLDataManagerBackend* backend) {
   DCHECK(backend);
   chrome_url_data_manager_backend_ = backend;
 }
 
-ChromeURLRequestContext::~ChromeURLRequestContext() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-}
-
 const std::string& ChromeURLRequestContext::GetUserAgent(
     const GURL& url) const {
   return content::GetUserAgent(url);
 }
 
 void ChromeURLRequestContext::OnAcceptLanguageChange(
     const std::string& accept_language) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   set_accept_language(
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language));
 }
 
 void ChromeURLRequestContext::OnDefaultCharsetChange(
     const std::string& default_charset) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   set_referrer_charset(default_charset);
   set_accept_charset(
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset));
 }