summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-08-29 03:13:57 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-29 10:15:12 +0000
commit39030edb9763a85a699c52539a9fe4181d03bd57 (patch)
treeeb5e1a1f22b932b187350b63fbb4640b668f5746 /net/http
parentad3c6870f41f0b057697ea8dec59cc8cf8108745 (diff)
downloadchromium_src-39030edb9763a85a699c52539a9fe4181d03bd57.zip
chromium_src-39030edb9763a85a699c52539a9fe4181d03bd57.tar.gz
chromium_src-39030edb9763a85a699c52539a9fe4181d03bd57.tar.bz2
Net-related fixups for scoped_refptr conversion operator cleanup.
BUG=110610 TBR=pkasting@chromium.org Review URL: https://codereview.chromium.org/511163002 Cr-Commit-Position: refs/heads/master@{#292600}
Diffstat (limited to 'net/http')
-rw-r--r--net/http/transport_security_persister.cc2
-rw-r--r--net/http/transport_security_persister.h13
2 files changed, 8 insertions, 7 deletions
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc
index 922491a..eda5638 100644
--- a/net/http/transport_security_persister.cc
+++ b/net/http/transport_security_persister.cc
@@ -97,7 +97,7 @@ namespace net {
TransportSecurityPersister::TransportSecurityPersister(
TransportSecurityState* state,
const base::FilePath& profile_path,
- base::SequencedTaskRunner* background_runner,
+ const scoped_refptr<base::SequencedTaskRunner>& background_runner,
bool readonly)
: transport_security_state_(state),
writer_(profile_path.AppendASCII("TransportSecurity"), background_runner),
diff --git a/net/http/transport_security_persister.h b/net/http/transport_security_persister.h
index 7725ba1..79a0d7a 100644
--- a/net/http/transport_security_persister.h
+++ b/net/http/transport_security_persister.h
@@ -13,7 +13,7 @@
// This means that it's possible for pages opened very quickly not to get the
// correct transport security information.
//
-// To load the state, we schedule a Task on file_task_runner, which
+// To load the state, we schedule a Task on background_runner, which
// deserializes and configures the TransportSecurityState.
//
// The TransportSecurityState object supports running a callback function
@@ -51,16 +51,17 @@ namespace net {
// Reads and updates on-disk TransportSecurity state. Clients of this class
// should create, destroy, and call into it from one thread.
//
-// file_task_runner is the task runner this class should use internally to
+// background_runner is the task runner this class should use internally to
// perform file IO, and can optionally be associated with a different thread.
class NET_EXPORT TransportSecurityPersister
: public TransportSecurityState::Delegate,
public base::ImportantFileWriter::DataSerializer {
public:
- TransportSecurityPersister(TransportSecurityState* state,
- const base::FilePath& profile_path,
- base::SequencedTaskRunner* file_task_runner,
- bool readonly);
+ TransportSecurityPersister(
+ TransportSecurityState* state,
+ const base::FilePath& profile_path,
+ const scoped_refptr<base::SequencedTaskRunner>& background_runner,
+ bool readonly);
virtual ~TransportSecurityPersister();
// Called by the TransportSecurityState when it changes its state.