Require explicit selection of traits for LazyInstance

content/browser/appcache/appcache_navigation_handle_core.cc

 // Copyright 2016 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 "content/browser/appcache/appcache_navigation_handle_core.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "content/browser/appcache/appcache_host.h"
 #include "content/browser/appcache/appcache_navigation_handle.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
 // Map of AppCache host id to the AppCacheNavigationHandleCore instance.
 // Accessed on the IO thread only.
 using AppCacheHandleMap =
     std::map <int, content::AppCacheNavigationHandleCore*>;
-base::LazyInstance<AppCacheHandleMap> g_appcache_handle_map;
+base::LazyInstance<AppCacheHandleMap>::DestructorAtExit g_appcache_handle_map;

[Nico, 2017/03/07 21:43:02]

= LAZY_INSTANCE_INITIALIZER

[scottmg, 2017/03/07 21:56:30]

Done. I am wondering why we do this at all now since it's just {0} anyway.

 
 }  // namespace
 
 namespace content {
 
 
 AppCacheNavigationHandleCore::AppCacheNavigationHandleCore(
     base::WeakPtr<AppCacheNavigationHandle> ui_handle,
     ChromeAppCacheService* appcache_service,
     int appcache_host_id)
@@ skipping 81 matching lines @@
   DCHECK(false);
 }
 
 void AppCacheNavigationHandleCore::OnContentBlocked(int host_id,
                                                     const GURL& manifest_url) {
   // Should never be called.
   DCHECK(false);
 }
 
 }  // namespace content