diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 22:16:47 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 22:16:47 +0000 |
| commit | 85ce42f1e8363a9578d1b857f5c58ce329ac0261 (patch) | |
| tree | 1622a0af585bf4d30bf148c9230de5c50a6ae69b /chrome/browser/profile.cc | |
| parent | 6224d84baa38b40595d1c259edb9acd3c130e383 (diff) | |
| download | chromium_src-85ce42f1e8363a9578d1b857f5c58ce329ac0261.zip chromium_src-85ce42f1e8363a9578d1b857f5c58ce329ac0261.tar.gz chromium_src-85ce42f1e8363a9578d1b857f5c58ce329ac0261.tar.bz2 | |
Reverting r25382: blame Windows
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index a8377d3..1aa04e8 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/browser/favicon_service.h" -#include "chrome/browser/force_tls_persister.h" #include "chrome/browser/history/history.h" #include "chrome/browser/in_process_webkit/webkit_context.h" #include "chrome/browser/net/chrome_url_request_context.h" @@ -265,7 +264,7 @@ class OffTheRecordProfileImpl : public Profile, virtual net::ForceTLSState* GetForceTLSState() { if (!force_tls_state_.get()) - force_tls_state_ = new net::ForceTLSState(); + force_tls_state_.reset(new net::ForceTLSState()); return force_tls_state_.get(); } @@ -522,7 +521,7 @@ class OffTheRecordProfileImpl : public Profile, scoped_ptr<SSLHostState> ssl_host_state_; // The ForceTLSState that only stores enabled sites in memory. - scoped_refptr<net::ForceTLSState> force_tls_state_; + scoped_ptr<net::ForceTLSState> force_tls_state_; // Time we were started. Time start_time_; @@ -824,11 +823,8 @@ SSLHostState* ProfileImpl::GetSSLHostState() { } net::ForceTLSState* ProfileImpl::GetForceTLSState() { - if (!force_tls_state_.get()) { - force_tls_state_ = new net::ForceTLSState(); - force_tls_persister_ = new ForceTLSPersister( - force_tls_state_.get(), g_browser_process->file_thread()); - } + if (!force_tls_state_.get()) + force_tls_state_.reset(new net::ForceTLSState()); return force_tls_state_.get(); } |