summaryrefslogtreecommitdiffstats
path: root/net/ssl
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 19:23:33 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 19:23:33 +0000
commitdcf10631a987ee1d2609e8538dcd6af0b8bb73fe (patch)
treeed44db242355c5b2c852742b5b396e51db0901af /net/ssl
parente8e396fe7c0f64223bee3c485312797b8b7b6024 (diff)
downloadchromium_src-dcf10631a987ee1d2609e8538dcd6af0b8bb73fe.zip
chromium_src-dcf10631a987ee1d2609e8538dcd6af0b8bb73fe.tar.gz
chromium_src-dcf10631a987ee1d2609e8538dcd6af0b8bb73fe.tar.bz2
Fix some WeakPtrFactory members that aren't last
BUG=303818 Review URL: https://codereview.chromium.org/26308002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ssl')
-rw-r--r--net/ssl/server_bound_cert_service.cc4
-rw-r--r--net/ssl/server_bound_cert_service.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc
index baed056..58d2209 100644
--- a/net/ssl/server_bound_cert_service.cc
+++ b/net/ssl/server_bound_cert_service.cc
@@ -371,11 +371,11 @@ ServerBoundCertService::ServerBoundCertService(
const scoped_refptr<base::TaskRunner>& task_runner)
: server_bound_cert_store_(server_bound_cert_store),
task_runner_(task_runner),
- weak_ptr_factory_(this),
requests_(0),
cert_store_hits_(0),
inflight_joins_(0),
- workers_created_(0) {
+ workers_created_(0),
+ weak_ptr_factory_(this) {
base::Time start = base::Time::Now();
base::Time end = start + base::TimeDelta::FromDays(
kValidityPeriodInDays + kSystemTimeValidityBufferInDays);
diff --git a/net/ssl/server_bound_cert_service.h b/net/ssl/server_bound_cert_service.h
index 0dc7f4a..4547210 100644
--- a/net/ssl/server_bound_cert_service.h
+++ b/net/ssl/server_bound_cert_service.h
@@ -197,7 +197,6 @@ class NET_EXPORT ServerBoundCertService
// inflight_ maps from a server to an active generation which is taking
// place.
std::map<std::string, ServerBoundCertServiceJob*> inflight_;
- base::WeakPtrFactory<ServerBoundCertService> weak_ptr_factory_;
uint64 requests_;
uint64 cert_store_hits_;
@@ -206,6 +205,8 @@ class NET_EXPORT ServerBoundCertService
bool is_system_time_valid_;
+ base::WeakPtrFactory<ServerBoundCertService> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ServerBoundCertService);
};