Restore KeyedServiceFactory diagnostics for context use-after-destroy.

chrome/browser/extensions/extension_gcm_app_handler.cc

 // Copyright 2014 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/extensions/extension_gcm_app_handler.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 35 matching lines @@
 }
 
 ExtensionGCMAppHandler::ExtensionGCMAppHandler(content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)),
       extension_registry_observer_(this),
       weak_factory_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
   js_event_router_.reset(new extensions::GcmJsEventRouter(profile_));
 }
 
-ExtensionGCMAppHandler::~ExtensionGCMAppHandler() {
+ExtensionGCMAppHandler::~ExtensionGCMAppHandler() = default;
+
+void ExtensionGCMAppHandler::Shutdown() {
   const ExtensionSet& enabled_extensions =
       ExtensionRegistry::Get(profile_)->enabled_extensions();
   for (ExtensionSet::const_iterator extension = enabled_extensions.begin();
        extension != enabled_extensions.end();
        ++extension) {
     if (IsGCMPermissionEnabled(extension->get()))
       GetGCMDriver()->RemoveAppHandler((*extension)->id());
   }
 }
 
@@ skipping 131 matching lines @@
 
 void ExtensionGCMAppHandler::AddAppHandler(const std::string& app_id) {
   GetGCMDriver()->AddAppHandler(app_id, this);
 }
 
 void ExtensionGCMAppHandler::RemoveAppHandler(const std::string& app_id) {
   GetGCMDriver()->RemoveAppHandler(app_id);
 }
 
 }  // namespace extensions