Pass user session type to extension feature checks

extensions/renderer/script_context.cc

Index: extensions/renderer/script_context.cc
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
index f611ddebf7112e9d6fb6b63aa5d993fb77fc4c07..f59eabf814fc249ee5077e060f8dd693e004d4b6 100644
--- a/extensions/renderer/script_context.cc
+++ b/extensions/renderer/script_context.cc
@@ -96,6 +96,7 @@ ScriptContext::ScriptContext(const v8::Local<v8::Context>& v8_context,
                              blink::WebLocalFrame* web_frame,
                              const Extension* extension,
                              Feature::Context context_type,
+                             Feature::SessionType session_type,
                              const Extension* effective_extension,
                              Feature::Context effective_context_type)
     : is_valid_(true),
@@ -103,6 +104,7 @@ ScriptContext::ScriptContext(const v8::Local<v8::Context>& v8_context,
       web_frame_(web_frame),
       extension_(extension),
       context_type_(context_type),
+      session_type_(session_type),
       effective_extension_(effective_extension),
       effective_context_type_(effective_context_type),
       safe_builtins_(this),
@@ -228,8 +230,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_, session_type_, url());
 }
 
 void ScriptContext::DispatchEvent(const char* event_name,
@@ -261,7 +263,7 @@ bool ScriptContext::IsAnyFeatureAvailableToContext(const Feature& api) {
                  ? url_
                  : GetDataSourceURLForFrame(web_frame());
   return ExtensionAPI::GetSharedInstance()->IsAnyFeatureAvailableToContext(
-      api, extension(), context_type(), url);
+      api, extension(), context_type(), session_type_, url);
 }
 
 // static