| Index: chrome/common/extensions/features/permission_feature.cc
|
| diff --git a/chrome/common/extensions/features/permission_feature.cc b/chrome/common/extensions/features/permission_feature.cc
|
| index b6085d22b122464faea00e1cb1715286d29ee01e..d2c652403387e3b1bbea3308199e4f2d04cf30b9 100644
|
| --- a/chrome/common/extensions/features/permission_feature.cc
|
| +++ b/chrome/common/extensions/features/permission_feature.cc
|
| @@ -15,14 +15,16 @@ PermissionFeature::~PermissionFeature() {
|
| Feature::Availability PermissionFeature::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;
|
|
|
| - if (!extension->HasAPIPermission(name()))
|
| + if (extension && !extension->HasAPIPermission(name()))
|
| return CreateAvailability(NOT_PRESENT, extension->GetType());
|
|
|
| return CreateAvailability(IS_AVAILABLE);
|
|
|