Require explicit selection of traits for LazyInstance

extensions/shell/common/shell_extensions_client.cc

 // Copyright 2014 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 "extensions/shell/common/shell_extensions_client.h"
 
 #include <memory>
 #include <string>
 
 #include "base/lazy_instance.h"
@@ skipping 46 matching lines @@
   PermissionIDSet GetAllPermissionIDs(
       const PermissionSet& permissions,
       Manifest::Type extension_type) const override {
     return PermissionIDSet();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellPermissionMessageProvider);
 };
 
-base::LazyInstance<ShellPermissionMessageProvider>
+base::LazyInstance<ShellPermissionMessageProvider>::DestructorAtExit
     g_permission_message_provider = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ShellExtensionsClient::ShellExtensionsClient()
     : extensions_api_permissions_(ExtensionsAPIPermissions()),
       webstore_base_url_(extension_urls::kChromeWebstoreBaseURL),
       webstore_update_url_(extension_urls::kChromeWebstoreUpdateURL) {}
 
 ShellExtensionsClient::~ShellExtensionsClient() {
@@ skipping 106 matching lines @@
   return webstore_update_url_;
 }
 
 bool ShellExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
   // TODO(rockot): Maybe we want to do something else here. For now we accept
   // any URL as a blacklist URL because we don't really care.
   return true;
 }
 
 }  // namespace extensions