Pass user session type to extension feature checks

extensions/renderer/script_context.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/script_context.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
@@ skipping 78 matching lines @@
   gin::ContextHolder* GetContextHolder() override;
 
  private:
   ScriptContext* context_;
 };
 
 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),
       v8_context_(v8_context->GetIsolate(), 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),
       isolate_(v8_context->GetIsolate()),
       runner_(new Runner(this)) {
   VLOG(1) << "Created context:\n" << GetDebugString();
   gin::PerContextData* gin_data = gin::PerContextData::From(v8_context);
   CHECK(gin_data);
   gin_data->set_runner(runner_.get());
   if (web_frame_)
@@ skipping 105 matching lines @@
   }
   // Hack: Hosted apps should have the availability of messaging APIs based on
   // the URL of the page (which might have access depending on some extension
   // with externally_connectable), not whether the app has access to messaging
   // (which it won't).
   const Extension* extension = extension_.get();
   if (extension && extension->is_hosted_app() &&
       (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,
                                   v8::Local<v8::Array> args) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   v8::HandleScope handle_scope(isolate());
   v8::Context::Scope context_scope(v8_context());
 
   v8::Local<v8::Value> argv[] = {v8::String::NewFromUtf8(isolate(), event_name),
                                  args};
@@ skipping 11 matching lines @@
   return GetContextTypeDescriptionString(effective_context_type_);
 }
 
 bool ScriptContext::IsAnyFeatureAvailableToContext(const Feature& api) {
   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(), session_type_, url);
 }
 
 // static
 GURL ScriptContext::GetDataSourceURLForFrame(const blink::WebFrame* frame) {
   // Normally we would use frame->document().url() to determine the document's
   // URL, but to decide whether to inject a content script, we use the URL from
   // the data source. This "quirk" helps prevents content scripts from
   // inadvertently adding DOM elements to the compose iframe in Gmail because
   // the compose iframe's dataSource URL is about:blank, but the document URL
   // changes to match the parent document after Gmail document.writes into
@@ skipping 226 matching lines @@
     v8::Local<v8::Value> argv[]) {
   return context_->CallFunction(function, argc, argv);
 }
 
 gin::ContextHolder* ScriptContext::Runner::GetContextHolder() {
   v8::HandleScope handle_scope(context_->isolate());
   return gin::PerContextData::From(context_->v8_context())->context_holder();
 }
 
 }  // namespace extensions