Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc

 // Copyright 2013 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/api/preference/chrome_direct_setting_api.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
@@ skipping 58 matching lines @@
       registrar->Add(pref_key, callback);
     }
   }
 
  private:
   base::hash_set<std::string> whitelist_;
 
   DISALLOW_COPY_AND_ASSIGN(PreferenceWhitelist);
 };
 
-base::LazyInstance<PreferenceWhitelist> preference_whitelist =
+base::LazyInstance<PreferenceWhitelist>::DestructorAtExit preference_whitelist =
     LAZY_INSTANCE_INITIALIZER;
 
 static base::LazyInstance<
-    BrowserContextKeyedAPIFactory<ChromeDirectSettingAPI> > g_factory =
-    LAZY_INSTANCE_INITIALIZER;
+    BrowserContextKeyedAPIFactory<ChromeDirectSettingAPI>>::DestructorAtExit
+    g_factory = LAZY_INSTANCE_INITIALIZER;
 
 ChromeDirectSettingAPI::ChromeDirectSettingAPI(content::BrowserContext* context)
     : profile_(Profile::FromBrowserContext(context)) {
   preference_whitelist.Get().RegisterEventListeners(profile_, this);
 }
 
 ChromeDirectSettingAPI::~ChromeDirectSettingAPI() {}
 
 // KeyedService implementation.
 void ChromeDirectSettingAPI::Shutdown() {}
@@ skipping 65 matching lines @@
         std::unique_ptr<Event> event(
             new Event(histogram_value, event_name, std::move(args_copy)));
         router->DispatchEventToExtension(extension_id, std::move(event));
       }
     }
   }
 }
 
 }  // namespace chromedirectsetting
 }  // namespace extensions