Require explicit selection of traits for LazyInstance

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 11 matching lines @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 namespace extensions {
 
 namespace {
 
 const char kDummyAppId[] = "extension.guard.dummy.id";
 
-base::LazyInstance<BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler> >
-    g_factory = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>>::
+    DestructorAtExit g_factory = LAZY_INSTANCE_INITIALIZER;
 
 bool IsGCMPermissionEnabled(const Extension* extension) {
   return extension->permissions_data()->HasAPIPermission(APIPermission::kGcm);
 }
 
 }  // namespace
 
 
 // static
 BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>*
@@ skipping 154 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