Remove extension group from DOMWrapperWorld.

extensions/renderer/script_context_set.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_set.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/extension.h"
-#include "extensions/renderer/extension_groups.h"
+#include "extensions/renderer/extensions_renderer_client.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_injection.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "v8/include/v8.h"
 
 namespace extensions {
 
 namespace {
 // There is only ever one instance of the ScriptContextSet.
 ScriptContextSet* g_context_set = nullptr;
 }
 
 ScriptContextSet::ScriptContextSet(ExtensionIdSet* active_extension_ids)
     : active_extension_ids_(active_extension_ids) {
   DCHECK(!g_context_set);
   g_context_set = this;
 }
 
 ScriptContextSet::~ScriptContextSet() {
   g_context_set = nullptr;
 }
 
 ScriptContext* ScriptContextSet::Register(
     blink::WebLocalFrame* frame,
     const v8::Local<v8::Context>& v8_context,
-    int extension_group,
     int world_id) {
   const Extension* extension =
       GetExtensionFromFrameAndWorld(frame, world_id, false);
   const Extension* effective_extension =
       GetExtensionFromFrameAndWorld(frame, world_id, true);
 
   GURL frame_url = ScriptContext::GetDataSourceURLForFrame(frame);
-  Feature::Context context_type =
-      ClassifyJavaScriptContext(extension, extension_group, frame_url,
-                                frame->document().getSecurityOrigin());
+  Feature::Context context_type = ClassifyJavaScriptContext(
+      extension, world_id, frame_url, frame->document().getSecurityOrigin());
   Feature::Context effective_context_type = ClassifyJavaScriptContext(
-      effective_extension, extension_group,
+      effective_extension, world_id,
       ScriptContext::GetEffectiveDocumentURL(frame, frame_url, true),
       frame->document().getSecurityOrigin());
 
   ScriptContext* context =
       new ScriptContext(v8_context, frame, extension, context_type,
                         effective_extension, effective_context_type);
   contexts_.insert(context);  // takes ownership
   return context;
 }
 
@@ skipping 101 matching lines @@
   const Extension* extension =
       RendererExtensionRegistry::Get()->GetByID(extension_id);
   if (!extension && !extension_id.empty() && extension_id != "invalid") {
     // TODO(kalman): Do something here?
   }
   return extension;
 }
 
 Feature::Context ScriptContextSet::ClassifyJavaScriptContext(
     const Extension* extension,
-    int extension_group,
+    int world_id,
     const GURL& url,
     const blink::WebSecurityOrigin& origin) {
   // WARNING: This logic must match ProcessMap::GetContextType, as much as
   // possible.
 
-  DCHECK_GE(extension_group, 0);
-  if (extension_group == EXTENSION_GROUP_CONTENT_SCRIPTS) {
+  // Worlds not within this range are not for content scripts, so ignore them.
+  // TODO(devlin): Isolated worlds with a non-zero id could belong to
+  // chrome-internal pieces, like dom distiller and translate. Do we need any
+  // bindings (even those for basic web pages) for those?
+  if (world_id >= ExtensionsRendererClient::Get()->GetLowestIsolatedWorldId()) {
     return extension ?  // TODO(kalman): when does this happen?
                Feature::CONTENT_SCRIPT_CONTEXT
                      : Feature::UNSPECIFIED_CONTEXT;
   }
 
   // We have an explicit check for sandboxed pages before checking whether the
   // extension is active in this process because:
   // 1. Sandboxed pages run in the same process as regular extension pages, so
   //    the extension is considered active.
   // 2. ScriptContext creation (which triggers bindings injection) happens
@@ skipping 34 matching lines @@
   return Feature::WEB_PAGE_CONTEXT;
 }
 
 void ScriptContextSet::RecordAndRemove(std::set<ScriptContext*>* removed,
                                        ScriptContext* context) {
   removed->insert(context);
   Remove(context);  // Note: context deletion is deferred to the message loop.
 }
 
 }  // namespace extensions