Require explicit selection of traits for LazyInstance

chrome/browser/extensions/blacklist.cc

 // Copyright 2012 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/blacklist.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 40 matching lines @@
   }
 
   void set(scoped_refptr<SafeBrowsingDatabaseManager> instance) {
     instance_ = instance;
   }
 
  private:
   scoped_refptr<SafeBrowsingDatabaseManager> instance_;
 };
 
-static base::LazyInstance<LazySafeBrowsingDatabaseManager> g_database_manager =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<LazySafeBrowsingDatabaseManager>::DestructorAtExit
+    g_database_manager = LAZY_INSTANCE_INITIALIZER;
 
 // Implementation of SafeBrowsingDatabaseManager::Client, the class which is
 // called back from safebrowsing queries.
 //
 // Constructed on any thread but lives on the IO from then on.
 class SafeBrowsingClientImpl
     : public SafeBrowsingDatabaseManager::Client,
       public base::RefCountedThreadSafe<SafeBrowsingClientImpl> {
  public:
   typedef base::Callback<void(const std::set<std::string>&)> OnResultCallback;
@@ skipping 278 matching lines @@
 
 void Blacklist::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE, type);
   for (auto& observer : observers_)
     observer.OnBlacklistUpdated();
 }
 
 }  // namespace extensions