Require explicit selection of traits for LazyInstance

chrome/browser/extensions/activity_log/activity_log.cc

 // Copyright (c) 2011 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/activity_log/activity_log.h"
 
 #include <stddef.h>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 369 matching lines @@
   }
 
  private:
   std::set<const content::BrowserContext*> contexts_;
   std::set<std::string> whitelisted_ids_;
   base::Lock lock_;
 
   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
 // checking that |browser_context| is valid.
 ActivityLog* SafeGetActivityLog(content::BrowserContext* browser_context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // There's a chance that the |browser_context| was deleted some time during
   // the thread hops.
   // TODO(devlin): We should probably be doing this more extensively throughout
   // extensions code.
@@ skipping 125 matching lines @@
   DCHECK(!current_web_request_monitor ||
          current_web_request_monitor == &LogWebRequestActivity);
   if (!current_web_request_monitor)
     activity_monitor::SetWebRequestMonitor(&LogWebRequestActivity);
 }
 
 }  // namespace
 
 // 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();
 }
 
 // static
 ActivityLog* ActivityLog::GetInstance(content::BrowserContext* context) {
   return ActivityLog::GetFactoryInstance()->Get(
       Profile::FromBrowserContext(context));
 }
@@ skipping 385 matching lines @@
   }
 }
 
 template <>
 void BrowserContextKeyedAPIFactory<ActivityLog>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   DependsOn(ExtensionRegistryFactory::GetInstance());
 }
 
 }  // namespace extensions