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 /components/sync_driver | |
| 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 'components/sync_driver')
| -rw-r--r-- | components/sync_driver/device_info_data_type_controller_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/sync_driver/device_info_data_type_controller_unittest.cc b/components/sync_driver/device_info_data_type_controller_unittest.cc index 18e4a5b..e1c4af3 100644 --- a/components/sync_driver/device_info_data_type_controller_unittest.cc +++ b/components/sync_driver/device_info_data_type_controller_unittest.cc @@ -22,8 +22,8 @@ class DeviceInfoDataTypeControllerTest : public testing::Test, public: DeviceInfoDataTypeControllerTest() : load_finished_(false), - weak_ptr_factory_(this), - last_type_(syncer::UNSPECIFIED) {} + last_type_(syncer::UNSPECIFIED), + weak_ptr_factory_(this) {} ~DeviceInfoDataTypeControllerTest() override {} void SetUp() override { @@ -108,9 +108,9 @@ class DeviceInfoDataTypeControllerTest : public testing::Test, private: base::MessageLoopForUI message_loop_; - base::WeakPtrFactory<DeviceInfoDataTypeControllerTest> weak_ptr_factory_; syncer::ModelType last_type_; syncer::SyncError last_error_; + base::WeakPtrFactory<DeviceInfoDataTypeControllerTest> weak_ptr_factory_; }; TEST_F(DeviceInfoDataTypeControllerTest, StartModels) { |