| Index: components/autofill/content/browser/risk/fingerprint.cc
|
| diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
|
| index 217cdf986b946d259d7a07184cc8521799c611c2..213819d8dbc2d2f4d4b0627ca94a106928659ace 100644
|
| --- a/components/autofill/content/browser/risk/fingerprint.cc
|
| +++ b/components/autofill/content/browser/risk/fingerprint.cc
|
| @@ -247,10 +247,6 @@ class FingerprintDataLoader : public content::GpuDataManagerObserver {
|
| // if not all asynchronous data has been loaded.
|
| base::OneShotTimer<FingerprintDataLoader> timeout_timer_;
|
|
|
| - // For invalidating asynchronous callbacks that might arrive after |this|
|
| - // instance is destroyed.
|
| - base::WeakPtrFactory<FingerprintDataLoader> weak_ptr_factory_;
|
| -
|
| // The callback that will be called once all the data is available.
|
| base::Callback<void(scoped_ptr<Fingerprint>)> callback_;
|
|
|
| @@ -258,6 +254,10 @@ class FingerprintDataLoader : public content::GpuDataManagerObserver {
|
| scoped_ptr<content::GeolocationProvider::Subscription>
|
| geolocation_subscription_;
|
|
|
| + // For invalidating asynchronous callbacks that might arrive after |this|
|
| + // instance is destroyed.
|
| + base::WeakPtrFactory<FingerprintDataLoader> weak_ptr_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(FingerprintDataLoader);
|
| };
|
|
|
| @@ -287,8 +287,8 @@ FingerprintDataLoader::FingerprintDataLoader(
|
| user_agent_(user_agent),
|
| install_time_(install_time),
|
| waiting_on_plugins_(true),
|
| - weak_ptr_factory_(this),
|
| - callback_(callback) {
|
| + callback_(callback),
|
| + weak_ptr_factory_(this) {
|
| DCHECK(!install_time_.is_null());
|
|
|
| timeout_timer_.Start(FROM_HERE, timeout,
|
|
|