| Index: extensions/renderer/script_context.cc
|
| diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
|
| index 0dff2e5131cc9cadbff05f38487ce48f86d99194..14adeda2c529716045665188ad728975e92dcd75 100644
|
| --- a/extensions/renderer/script_context.cc
|
| +++ b/extensions/renderer/script_context.cc
|
| @@ -221,6 +221,12 @@ void ScriptContext::SafeCallFunction(const v8::Local<v8::Function>& function,
|
|
|
| Feature::Availability ScriptContext::GetAvailability(
|
| const std::string& api_name) {
|
| + return GetAvailability(api_name, true);
|
| +}
|
| +
|
| +Feature::Availability ScriptContext::GetAvailability(
|
| + const std::string& api_name,
|
| + bool allow_alias) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| if (base::StartsWith(api_name, "test", base::CompareCase::SENSITIVE)) {
|
| bool allowed = base::CommandLine::ForCurrentProcess()->
|
| @@ -239,8 +245,8 @@ Feature::Availability ScriptContext::GetAvailability(
|
| (api_name == "runtime.connect" || api_name == "runtime.sendMessage")) {
|
| extension = NULL;
|
| }
|
| - return ExtensionAPI::GetSharedInstance()->IsAvailable(api_name, extension,
|
| - context_type_, url());
|
| + return ExtensionAPI::GetSharedInstance()->IsAvailable(
|
| + api_name, extension, context_type_, url(), allow_alias);
|
| }
|
|
|
| void ScriptContext::DispatchEvent(const char* event_name,
|
| @@ -265,14 +271,15 @@ std::string ScriptContext::GetEffectiveContextTypeDescription() const {
|
| return GetContextTypeDescriptionString(effective_context_type_);
|
| }
|
|
|
| -bool ScriptContext::IsAnyFeatureAvailableToContext(const Feature& api) {
|
| +bool ScriptContext::IsAnyFeatureAvailableToContext(const Feature& api,
|
| + bool allow_alias) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| // TODO(lazyboy): Decide what we should do for SERVICE_WORKER_CONTEXT.
|
| GURL url = context_type() == Feature::SERVICE_WORKER_CONTEXT
|
| ? url_
|
| : GetDataSourceURLForFrame(web_frame());
|
| return ExtensionAPI::GetSharedInstance()->IsAnyFeatureAvailableToContext(
|
| - api, extension(), context_type(), url);
|
| + api, extension(), context_type(), url, allow_alias);
|
| }
|
|
|
| // static
|
|
|