Revert of Move Extension ScriptContext creation into ScriptContextSet.

extensions/renderer/script_context.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_SCRIPT_CONTEXT_H_
 #define EXTENSIONS_RENDERER_SCRIPT_CONTEXT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/renderer/module_system.h"
 #include "extensions/renderer/request_sender.h"
 #include "extensions/renderer/safe_builtins.h"
 #include "gin/runner.h"
 #include "url/gurl.h"
 #include "v8/include/v8.h"
 
 namespace blink {
 class WebFrame;
-class WebLocalFrame;
 }
 
 namespace content {
 class RenderFrame;
 class RenderView;
 }
 
 namespace extensions {
 class Extension;
-class ExtensionSet;
 
 // Extensions wrapper for a v8 context.
 class ScriptContext : public RequestSender::Source {
  public:
   ScriptContext(const v8::Handle<v8::Context>& context,
-                blink::WebLocalFrame* frame,
+                blink::WebFrame* frame,
                 const Extension* extension,
                 Feature::Context context_type,
                 const Extension* effective_extension,
                 Feature::Context effective_context_type);
   ~ScriptContext() override;
 
-  // Returns whether |url| is sandboxed (as declared in any Extension in
-  // |extension_set| as sandboxed).
-  //
-  // Declared in ScriptContext for lack of a better place, but this should
-  // become unnecessary at some point as crbug.com/466373 is worked on.
-  static bool IsSandboxedPage(const ExtensionSet& extension_set,
-                              const GURL& url);
-
   // Clears the WebFrame for this contexts and invalidates the associated
   // ModuleSystem.
   void Invalidate();
 
   // Returns true if this context is still valid, false if it isn't.
   // A context becomes invalid via Invalidate().
   bool is_valid() const { return !v8_context_.IsEmpty(); }
 
   v8::Handle<v8::Context> v8_context() const {
     return v8::Local<v8::Context>::New(isolate_, v8_context_);
   }
 
   const Extension* extension() const { return extension_.get(); }
 
   const Extension* effective_extension() const {
     return effective_extension_.get();
   }
 
-  blink::WebLocalFrame* web_frame() const { return web_frame_; }
+  blink::WebFrame* web_frame() const { return web_frame_; }
 
   Feature::Context context_type() const { return context_type_; }
 
   Feature::Context effective_context_type() const {
     return effective_context_type_;
   }
 
   void set_module_system(scoped_ptr<ModuleSystem> module_system) {
     module_system_ = module_system.Pass();
   }
@@ skipping 34 matching lines @@
 
   // Returns a string description of the type of context this is.
   std::string GetContextTypeDescription();
 
   // Returns a string description of the effective type of context this is.
   std::string GetEffectiveContextTypeDescription();
 
   v8::Isolate* isolate() const { return isolate_; }
 
   // Get the URL of this context's web frame.
-  //
-  // TODO(kalman): Remove this and replace with a GetOrigin() call which reads
-  // of WebDocument::securityOrigin():
-  //  - The URL can change (e.g. pushState) but the origin cannot. Luckily it
-  //    appears as though callers don't make security decisions based on the
-  //    result of GetURL() so it's not a problem... yet.
-  //  - Origin is the correct check to be making.
-  //  - It might let us remove the about:blank resolving?
   GURL GetURL() const;
 
   // Returns whether the API |api| or any part of the API could be
   // available in this context without taking into account the context's
   // extension.
   bool IsAnyFeatureAvailableToContext(const extensions::Feature& api);
 
   // Utility to get the URL we will match against for a frame. If the frame has
   // committed, this is the commited URL. Otherwise it is the provisional URL.
   // The returned URL may be invalid.
@@ skipping 23 matching lines @@
   // extension.
   bool HasAPIPermission(APIPermission::ID permission) const;
 
  protected:
   // The v8 context the bindings are accessible to.
   v8::Global<v8::Context> v8_context_;
 
  private:
   class Runner;
 
-  // The WebLocalFrame associated with this context. This can be NULL because
-  // this object can outlive is destroyed asynchronously.
-  blink::WebLocalFrame* web_frame_;
+  // The WebFrame associated with this context. This can be NULL because this
+  // object can outlive is destroyed asynchronously.
+  blink::WebFrame* web_frame_;
 
   // The extension associated with this context, or NULL if there is none. This
   // might be a hosted app in the case that this context is hosting a web URL.
   scoped_refptr<const Extension> extension_;
 
   // The type of context.
   Feature::Context context_type_;
 
   // The effective extension associated with this context, or NULL if there is
   // none. This is different from the above extension if this context is in an
@@ skipping 17 matching lines @@
   GURL url_;
 
   scoped_ptr<Runner> runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptContext);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_CONTEXT_H_