Fix crash when shutting down affiliated invalidation service provider

chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 191 matching lines @@
     invalidation_service_ = nullptr;
     DestroyDeviceInvalidationService();
   }
 }
 
 void AffiliatedInvalidationServiceProviderImpl::Shutdown() {
   is_shut_down_ = true;
 
   registrar_.RemoveAll();
   profile_invalidation_service_observers_.clear();
-  DestroyDeviceInvalidationService();
+  device_invalidation_service_observer_.reset();
 
   if (invalidation_service_) {
     invalidation_service_ = nullptr;
     // Explicitly notify consumers that the invalidation service they were using
     // is no longer available.
     SetInvalidationService(nullptr);
   }
+
+  DestroyDeviceInvalidationService();
 }
 
 invalidation::TiclInvalidationService*
 AffiliatedInvalidationServiceProviderImpl::
     GetDeviceInvalidationServiceForTest() const {
   return device_invalidation_service_.get();
 }
 
 void AffiliatedInvalidationServiceProviderImpl::OnInvalidationServiceConnected(
     invalidation::InvalidationService* invalidation_service) {
@@ skipping 109 matching lines @@
                     OnInvalidationServiceSet(invalidation_service_));
 }
 
 void
 AffiliatedInvalidationServiceProviderImpl::DestroyDeviceInvalidationService() {
   device_invalidation_service_observer_.reset();
   device_invalidation_service_.reset();
 }
 
 }  // namespace policy