Require explicit selection of traits for LazyInstance

extensions/common/permissions/permissions_info.h

 // 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.
 
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 38 matching lines @@
       const std::set<std::string>& permission_names) const;
 
   // Checks if any permissions have names that start with |name| followed by a
   // period.
   bool HasChildPermissions(const std::string& name) const;
 
   // Gets the total number of API permissions.
   size_t get_permission_count() const { return permission_count_; }
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<PermissionsInfo>;
+  friend struct base::LazyInstanceTraitsBase<PermissionsInfo>;
 
   PermissionsInfo();
 
   virtual ~PermissionsInfo();
 
   // Registers an |alias| for a given permission |name|.
   void RegisterAlias(const Alias& alias);
 
   // Registers a permission with the specified attributes and flags.
   void RegisterPermission(std::unique_ptr<APIPermissionInfo> permission);
 
   // Maps permission ids to permissions. Owns the permissions.
   typedef std::map<APIPermission::ID, std::unique_ptr<APIPermissionInfo>> IDMap;
 
   // Maps names and aliases to permissions. Doesn't own the permissions.
   typedef std::map<std::string, APIPermissionInfo*> NameMap;
 
   IDMap id_map_;
   NameMap name_map_;
 
   size_t permission_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsInfo);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_