Restore KeyedServiceFactory diagnostics for context use-after-destroy.

chrome/browser/extensions/extension_gcm_app_handler_unittest.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 <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 262 matching lines @@
     // Create a fake version of ExtensionGCMAppHandler.
     gcm_app_handler_.reset(new FakeExtensionGCMAppHandler(profile(), &waiter_));
   }
 
   void TearDown() override {
 #if defined(OS_CHROMEOS)
     test_user_manager_.reset();
 #endif
 
     waiter_.PumpUILoop();
+    gcm_app_handler_->Shutdown();
   }
 
   // Returns a barebones test extension.
   scoped_refptr<Extension> CreateExtension() {
     base::DictionaryValue manifest;
     manifest.SetString(manifest_keys::kVersion, "1.0.0.0");
     manifest.SetString(manifest_keys::kName, kTestExtensionName);
     base::ListValue* permission_list = new base::ListValue;
     permission_list->AppendString("gcm");
     manifest.Set(manifest_keys::kPermissions, permission_list);
@@ skipping 190 matching lines @@
 
   // App handler is removed when the extension is updated to the version that
   // has GCM permission removed.
   UpdateExtension(extension.get(), "good2.crx");
   waiter()->PumpUILoop();
   EXPECT_TRUE(gcm_app_handler()->app_handler_count_drop_to_zero());
   EXPECT_FALSE(HasAppHandlers(extension->id()));
 }
 
 }  // namespace extensions