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/profiles/profile_impl_io_data.h | |
| 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/profiles/profile_impl_io_data.h')
| -rw-r--r-- | chrome/browser/profiles/profile_impl_io_data.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h index 4bda4a6..153e278 100644 --- a/chrome/browser/profiles/profile_impl_io_data.h +++ b/chrome/browser/profiles/profile_impl_io_data.h @@ -125,14 +125,14 @@ class ProfileImplIOData : public ProfileIOData { virtual void LazyInitializeInternal( ProfileParams* profile_params) const OVERRIDE; - virtual scoped_refptr<ChromeURLRequestContext> InitializeAppRequestContext( - scoped_refptr<ChromeURLRequestContext> main_context, + virtual ChromeURLRequestContext* InitializeAppRequestContext( + ChromeURLRequestContext* main_context, const std::string& app_id) const OVERRIDE; - virtual scoped_refptr<ChromeURLRequestContext> + virtual ChromeURLRequestContext* AcquireMediaRequestContext() const OVERRIDE; - virtual scoped_refptr<ChromeURLRequestContext> + virtual ChromeURLRequestContext* AcquireIsolatedAppRequestContext( - scoped_refptr<ChromeURLRequestContext> main_context, + ChromeURLRequestContext* main_context, const std::string& app_id) const OVERRIDE; // Clears the networking history since |time|. @@ -147,7 +147,7 @@ class ProfileImplIOData : public ProfileIOData { mutable scoped_ptr<chrome_browser_net::Predictor> predictor_; - mutable scoped_refptr<ChromeURLRequestContext> media_request_context_; + mutable scoped_ptr<ChromeURLRequestContext> media_request_context_; // Parameters needed for isolated apps. FilePath app_path_; |