Require explicit selection of traits for LazyInstance

extensions/browser/api/power/power_api.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/power/power_api.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/power_save_blocker/power_save_blocker.h"
@@ skipping 13 matching lines @@
     case api::power::LEVEL_SYSTEM:
       return device::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension;
     case api::power::LEVEL_DISPLAY:  // fallthrough
     case api::power::LEVEL_NONE:
       return device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
   }
   NOTREACHED() << "Unhandled level " << level;
   return device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
 }
 
-base::LazyInstance<BrowserContextKeyedAPIFactory<PowerAPI>> g_factory =
-    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<BrowserContextKeyedAPIFactory<PowerAPI>>::DestructorAtExit
+    g_factory = LAZY_INSTANCE_INITIALIZER;
 
 std::unique_ptr<device::PowerSaveBlocker> CreatePowerSaveBlocker(
     device::PowerSaveBlocker::PowerSaveBlockerType type,
     device::PowerSaveBlocker::Reason reason,
     const std::string& description,
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
   return std::unique_ptr<device::PowerSaveBlocker>(new device::PowerSaveBlocker(
       type, reason, description, ui_task_runner, file_task_runner));
 }
@@ skipping 90 matching lines @@
 }
 
 void PowerAPI::Shutdown() {
   // Unregister here rather than in the d'tor; otherwise this call will recreate
   // the already-deleted ExtensionRegistry.
   ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
   power_save_blocker_.reset();
 }
 
 }  // namespace extensions