Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4454)

Unified Diff: chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

Issue 942463002: Fix crash when shutting down affiliated invalidation service provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
index ad052be47c858cbd0a0fa741e633b3f8ba5b1c44..52547620b6e916d306e07b3da1c566b5ca4187fa 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
@@ -209,7 +209,7 @@ void AffiliatedInvalidationServiceProviderImpl::Shutdown() {
registrar_.RemoveAll();
profile_invalidation_service_observers_.clear();
- DestroyDeviceInvalidationService();
+ device_invalidation_service_observer_.reset();
if (invalidation_service_) {
invalidation_service_ = nullptr;
@@ -217,6 +217,8 @@ void AffiliatedInvalidationServiceProviderImpl::Shutdown() {
// is no longer available.
SetInvalidationService(nullptr);
}
+
+ DestroyDeviceInvalidationService();
}
invalidation::TiclInvalidationService*
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698