| Index: chrome/common/extensions/features/manifest_feature.cc
|
| diff --git a/chrome/common/extensions/features/manifest_feature.cc b/chrome/common/extensions/features/manifest_feature.cc
|
| index 28406d8fecacb2f006413a9d2315e6ea3c61ad7f..51d9fd51d5c39746fa52d00b74f5f0b0b3d6a1e5 100644
|
| --- a/chrome/common/extensions/features/manifest_feature.cc
|
| +++ b/chrome/common/extensions/features/manifest_feature.cc
|
| @@ -17,16 +17,18 @@ ManifestFeature::~ManifestFeature() {
|
| Feature::Availability ManifestFeature::IsAvailableToContext(
|
| const Extension* extension,
|
| Feature::Context context,
|
| + const GURL& url,
|
| Feature::Platform platform) const {
|
| Availability availability = SimpleFeature::IsAvailableToContext(extension,
|
| context,
|
| + url,
|
| platform);
|
| if (!availability.is_available())
|
| return availability;
|
|
|
| // We know we can skip manifest()->GetKey() here because we just did the same
|
| // validation it would do above.
|
| - if (!extension->manifest()->value()->HasKey(name()))
|
| + if (extension && !extension->manifest()->value()->HasKey(name()))
|
| return CreateAvailability(NOT_PRESENT, extension->GetType());
|
|
|
| return CreateAvailability(IS_AVAILABLE);
|
|
|