Require explicit selection of traits for LazyInstance

extensions/browser/api/storage/storage_frontend.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 "extensions/browser/api/storage/storage_frontend.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 13 matching lines @@
 #include "extensions/browser/value_store/value_store_factory.h"
 #include "extensions/common/api/storage.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 namespace extensions {
 
 namespace {
 
-base::LazyInstance<BrowserContextKeyedAPIFactory<StorageFrontend> > g_factory =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<BrowserContextKeyedAPIFactory<StorageFrontend>>::
+    DestructorAtExit g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // Settings change Observer which forwards changes on to the extension
 // processes for |context| and its incognito partner if it exists.
 class DefaultObserver : public SettingsObserver {
  public:
   explicit DefaultObserver(BrowserContext* context)
       : browser_context_(context) {}
 
   // SettingsObserver implementation.
   void OnSettingsChanged(const std::string& extension_id,
@@ skipping 138 matching lines @@
 // static
 BrowserContextKeyedAPIFactory<StorageFrontend>*
 StorageFrontend::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 const char* StorageFrontend::service_name() { return "StorageFrontend"; }
 
 }  // namespace extensions