Require explicit selection of traits for LazyInstance

chrome/common/extensions/chrome_manifest_url_handlers.cc

 // Copyright (c) 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/common/extensions/chrome_manifest_url_handlers.h"
 
 #include <memory>
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
@@ skipping 33 matching lines @@
   return ManifestURL::Get(extension, keys::kDevToolsPage);
 }
 }
 
 URLOverrides::URLOverrides() {
 }
 
 URLOverrides::~URLOverrides() {
 }
 
-static base::LazyInstance<URLOverrides::URLOverrideMap> g_empty_url_overrides =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<URLOverrides::URLOverrideMap>::DestructorAtExit
+    g_empty_url_overrides = LAZY_INSTANCE_INITIALIZER;
 
 // static
 const URLOverrides::URLOverrideMap& URLOverrides::GetChromeURLOverrides(
     const Extension* extension) {
   URLOverrides* url_overrides = static_cast<URLOverrides*>(
       extension->GetManifestData(keys::kChromeURLOverrides));
   return url_overrides ? url_overrides->chrome_url_overrides_
                        : g_empty_url_overrides.Get();
 }
 
@@ skipping 102 matching lines @@
     }
   }
   return true;
 }
 
 const std::vector<std::string> URLOverridesHandler::Keys() const {
   return SingleKey(keys::kChromeURLOverrides);
 }
 
 }  // namespace extensions