Require explicit selection of traits for LazyInstance

chrome/browser/extensions/activity_log/activity_log.cc

Index: chrome/browser/extensions/activity_log/activity_log.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index 74cfad389d8fd60544663b918ace3713d0e074d2..cd6120429e48668e00b1bc0aab9362333725d0c4 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -387,7 +387,7 @@ class ActivityLogState {
   DISALLOW_COPY_AND_ASSIGN(ActivityLogState);
 };
 
-base::LazyInstance<ActivityLogState> g_activity_log_state =
+base::LazyInstance<ActivityLogState>::DestructorAtExit g_activity_log_state =
     LAZY_INSTANCE_INITIALIZER;
 
 // Returns the ActivityLog associated with the given |browser_context| after
@@ -533,8 +533,9 @@ void SetActivityHandlers() {
 
 // SET THINGS UP. --------------------------------------------------------------
 
-static base::LazyInstance<BrowserContextKeyedAPIFactory<ActivityLog> >
-    g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<
+    BrowserContextKeyedAPIFactory<ActivityLog>>::DestructorAtExit g_factory =
+    LAZY_INSTANCE_INITIALIZER;
 
 BrowserContextKeyedAPIFactory<ActivityLog>* ActivityLog::GetFactoryInstance() {
   return g_factory.Pointer();