| Index: chrome/common/extensions/api/extension_api.cc
|
| diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
|
| index b1095a45f881c98828c99e5e038aa21432b573f4..97a2fdda596d16694ceba9fd0e07ae47a8f23b5a 100644
|
| --- a/chrome/common/extensions/api/extension_api.cc
|
| +++ b/chrome/common/extensions/api/extension_api.cc
|
| @@ -426,10 +426,11 @@ Feature::Availability ExtensionAPI::IsAvailable(const std::string& full_name,
|
|
|
| // Check APIs not using the feature system first.
|
| if (!feature) {
|
| - return IsNonFeatureAPIAvailable(api_name, context, extension, url) ?
|
| - Feature::CreateAvailability(Feature::IS_AVAILABLE, "") :
|
| - Feature::CreateAvailability(Feature::INVALID_CONTEXT,
|
| - kUnavailableMessage);
|
| + return IsNonFeatureAPIAvailable(api_name, context, extension, url)
|
| + ? Feature::CreateAvailability(Feature::IS_AVAILABLE,
|
| + std::string())
|
| + : Feature::CreateAvailability(Feature::INVALID_CONTEXT,
|
| + kUnavailableMessage);
|
| }
|
|
|
| Feature::Availability availability =
|
| @@ -445,7 +446,7 @@ Feature::Availability ExtensionAPI::IsAvailable(const std::string& full_name,
|
| return dependency_availability;
|
| }
|
|
|
| - return Feature::CreateAvailability(Feature::IS_AVAILABLE, "");
|
| + return Feature::CreateAvailability(Feature::IS_AVAILABLE, std::string());
|
| }
|
|
|
| bool ExtensionAPI::IsPrivileged(const std::string& full_name) {
|
| @@ -634,7 +635,7 @@ std::string ExtensionAPI::GetAPINameFromFullName(const std::string& full_name,
|
| }
|
|
|
| *child_name = "";
|
| - return "";
|
| + return std::string();
|
| }
|
|
|
| bool ExtensionAPI::IsAPIAllowed(const std::string& name,
|
|
|