Commit 920b8abe authored by Jon Mann's avatar Jon Mann Committed by Chromium LUCI CQ

Wi-Fi Sync: Fix the destruction order for the service.

The order of destruction for members of WifiConfigurationSyncService
was incorrect, possibly causing a crash on shutdown.

Bug: 1145366
Change-Id: I227c805c3eba2d7aed21114de7a3318f0e7decd4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2641475Reviewed-by: default avatarAzeem Arshad <azeemarshad@chromium.org>
Commit-Queue: Jon Mann <jonmann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845717}
parent 4cfbef5f
......@@ -48,13 +48,13 @@ class WifiConfigurationSyncService : public KeyedService {
base::WeakPtr<NetworkMetadataStore> network_metadata_store);
private:
std::unique_ptr<WifiConfigurationBridge> bridge_;
std::unique_ptr<SyncedNetworkUpdaterImpl> updater_;
std::unique_ptr<LocalNetworkCollectorImpl> collector_;
std::unique_ptr<SyncedNetworkMetricsLogger> metrics_logger_;
std::unique_ptr<TimerFactory> timer_factory_;
mojo::Remote<chromeos::network_config::mojom::CrosNetworkConfig>
remote_cros_network_config_;
std::unique_ptr<SyncedNetworkMetricsLogger> metrics_logger_;
std::unique_ptr<TimerFactory> timer_factory_;
std::unique_ptr<SyncedNetworkUpdaterImpl> updater_;
std::unique_ptr<LocalNetworkCollectorImpl> collector_;
std::unique_ptr<WifiConfigurationBridge> bridge_;
DISALLOW_COPY_AND_ASSIGN(WifiConfigurationSyncService);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment