Require explicit selection of traits for LazyInstance

chrome/browser/extensions/api/omnibox/omnibox_api.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/browser/extensions/api/omnibox/omnibox_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 176 matching lines @@
   omnibox_icon_manager_.set_monochrome(true);
 }
 
 void OmniboxAPI::Shutdown() {
   template_url_sub_.reset();
 }
 
 OmniboxAPI::~OmniboxAPI() {
 }
 
-static base::LazyInstance<BrowserContextKeyedAPIFactory<OmniboxAPI> >
-    g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<
+    BrowserContextKeyedAPIFactory<OmniboxAPI>>::DestructorAtExit g_factory =
+    LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<OmniboxAPI>* OmniboxAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 OmniboxAPI* OmniboxAPI::Get(content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<OmniboxAPI>::Get(context);
 }
@@ skipping 166 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions