diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 02:53:39 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 02:53:39 +0000 |
| commit | 08bc630cdb69b98c193661dc4e81e3ed81ccccff (patch) | |
| tree | b247dadb4245e7f4e68a4891adde6226e6bb5da8 /chrome/test | |
| parent | 629a5cd1b524d9677ec217c37e9bcf97e66f4d84 (diff) | |
| download | chromium_src-08bc630cdb69b98c193661dc4e81e3ed81ccccff.zip chromium_src-08bc630cdb69b98c193661dc4e81e3ed81ccccff.tar.gz chromium_src-08bc630cdb69b98c193661dc4e81e3ed81ccccff.tar.bz2 | |
Rewrite the HostContentSettingsMap to address some issues:
* Interface not well-designed for the actual uses
* Objects in URL request context must be refcounted since Profile is destroyed before the UI thread
BUG=33314
TEST=none
Review URL: http://codereview.chromium.org/555184
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/testing_profile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 86aa2dd..59049b4 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -180,7 +180,7 @@ class TestingProfile : public Profile { virtual Blacklist* GetPrivacyBlacklist() { return NULL; } virtual HostContentSettingsMap* GetHostContentSettingsMap() { if (!host_content_settings_map_.get()) - host_content_settings_map_.reset(new HostContentSettingsMap(this)); + host_content_settings_map_ = new HostContentSettingsMap(this); return host_content_settings_map_.get(); } virtual HostZoomMap* GetHostZoomMap() { return NULL; } @@ -300,7 +300,7 @@ class TestingProfile : public Profile { // WebKitContext, lazily initialized by GetWebKitContext(). scoped_refptr<WebKitContext> webkit_context_; - scoped_ptr<HostContentSettingsMap> host_content_settings_map_; + scoped_refptr<HostContentSettingsMap> host_content_settings_map_; }; // A profile that derives from another profile. This does not actually |