diff options
| author | dmichael <dmichael@chromium.org> | 2014-12-12 11:01:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-12 19:02:31 +0000 |
| commit | 23a804335e8955cac7825039ce3c40a8a23fc436 (patch) | |
| tree | 0be2aaafd51d273ee856bac02909b7560215e4e4 /device/hid/hid_service_linux.h | |
| parent | 5262e5a158f6302eb4dac49d416b1a00f37186ba (diff) | |
| download | chromium_src-23a804335e8955cac7825039ce3c40a8a23fc436.zip chromium_src-23a804335e8955cac7825039ce3c40a8a23fc436.tar.gz chromium_src-23a804335e8955cac7825039ce3c40a8a23fc436.tar.bz2 | |
Fix remaining WeakPtrFactory ordering problems in preparation for turning on the check.
WeakPtrFactory members should always be last so that they invalidate WeakPtrs prior to other destructors running. These are mostly trivial/mechanical ones.
(We'll also need https://codereview.chromium.org/795003003/, which I split out)
BUG=303818
TBR=rockot,vitalybuka,cbentzel,shess,dmazzoni,stanisc,sky,tim,mathp,benjhayden,kinuko,scottmg,sergeyu,zork,ddorwin
Review URL: https://codereview.chromium.org/780713002
Cr-Commit-Position: refs/heads/master@{#308137}
Diffstat (limited to 'device/hid/hid_service_linux.h')
| -rw-r--r-- | device/hid/hid_service_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h index 59b6036..fd833b6 100644 --- a/device/hid/hid_service_linux.h +++ b/device/hid/hid_service_linux.h @@ -50,8 +50,8 @@ class HidServiceLinux : public HidService { // The helper lives on the FILE thread and holds a weak reference back to the // service that owns it. - base::WeakPtrFactory<HidServiceLinux> weak_factory_; scoped_ptr<Helper> helper_; + base::WeakPtrFactory<HidServiceLinux> weak_factory_; DISALLOW_COPY_AND_ASSIGN(HidServiceLinux); }; |