| Index: chrome/common/extensions/extension_file_util.cc
|
| diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
|
| index f5cf9f48920a8880e0ef8387b6523a1052e5e5e3..b54bd62da2aaaf617859248eb67ccbb64f664775 100644
|
| --- a/chrome/common/extensions/extension_file_util.cc
|
| +++ b/chrome/common/extensions/extension_file_util.cc
|
| @@ -514,8 +514,9 @@ bool CheckForIllegalFilenames(const FilePath& extension_path,
|
| Extension::kLocaleFolder,
|
| FILE_PATH_LITERAL("__MACOSX"),
|
| };
|
| - static std::set<FilePath::StringType> reserved_underscore_names(
|
| - reserved_names, reserved_names + arraysize(reserved_names));
|
| + CR_DEFINE_STATIC_LOCAL(
|
| + std::set<FilePath::StringType>, reserved_underscore_names,
|
| + (reserved_names, reserved_names + arraysize(reserved_names)));
|
|
|
| // Enumerate all files and directories in the extension root.
|
| // There is a problem when using pattern "_*" with FileEnumerator, so we have
|
|
|