Remove extension group from DOMWrapperWorld.

third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp

 // 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 "web/SuspendableScriptExecutor.h"
 
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8PersistentValueVector.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/frame/LocalFrame.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebScriptExecutionCallback.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/Vector.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
 class WebScriptExecutor : public SuspendableScriptExecutor::Executor {
  public:
   WebScriptExecutor(const HeapVector<ScriptSourceCode>& sources,
                     int worldID,
-                    int extensionGroup,
                     bool userGesture);
 
   Vector<v8::Local<v8::Value>> execute(LocalFrame*) override;
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_sources);
     SuspendableScriptExecutor::Executor::trace(visitor);
   }
 
  private:
   HeapVector<ScriptSourceCode> m_sources;
   int m_worldID;
-  int m_extensionGroup;
   bool m_userGesture;
 };
 
 WebScriptExecutor::WebScriptExecutor(
     const HeapVector<ScriptSourceCode>& sources,
     int worldID,
-    int extensionGroup,
     bool userGesture)
     : m_sources(sources),
       m_worldID(worldID),
-      m_extensionGroup(extensionGroup),
       m_userGesture(userGesture) {}
 
 Vector<v8::Local<v8::Value>> WebScriptExecutor::execute(LocalFrame* frame) {
   std::unique_ptr<UserGestureIndicator> indicator;
   if (m_userGesture) {
     indicator = WTF::wrapUnique(
         new UserGestureIndicator(DocumentUserGestureToken::create(
             frame->document(), UserGestureToken::NewGesture)));
   }
 
   Vector<v8::Local<v8::Value>> results;
   if (m_worldID) {
     frame->script().executeScriptInIsolatedWorld(m_worldID, m_sources,
-                                                 m_extensionGroup, &results);
+                                                 &results);
   } else {
     v8::Local<v8::Value> scriptValue =
         frame->script().executeScriptInMainWorldAndReturnValue(
             m_sources.front());
     results.push_back(scriptValue);
   }
 
   return results;
 }
 
@@ skipping 51 matching lines @@
   }
   return results;
 }
 
 }  // namespace
 
 void SuspendableScriptExecutor::createAndRun(
     LocalFrame* frame,
     int worldID,
     const HeapVector<ScriptSourceCode>& sources,
-    int extensionGroup,
     bool userGesture,
     WebScriptExecutionCallback* callback) {
   // TODO(devlin): Passing in a v8::Isolate* directly would be better than
   // toIsolate() here.
   ScriptState* scriptState = ScriptState::forWorld(
-      frame,
-      *DOMWrapperWorld::fromWorldId(toIsolate(frame), worldID, extensionGroup));
+      frame, *DOMWrapperWorld::fromWorldId(toIsolate(frame), worldID));
   SuspendableScriptExecutor* executor = new SuspendableScriptExecutor(
       frame, scriptState, callback,
-      new WebScriptExecutor(sources, worldID, extensionGroup, userGesture));
+      new WebScriptExecutor(sources, worldID, userGesture));
   executor->run();
 }
 
 void SuspendableScriptExecutor::createAndRun(
     LocalFrame* frame,
     v8::Isolate* isolate,
     v8::Local<v8::Context> context,
     v8::Local<v8::Function> function,
     v8::Local<v8::Value> receiver,
     int argc,
@@ skipping 71 matching lines @@
   m_keepAlive.clear();
   stop();
 }
 
 DEFINE_TRACE(SuspendableScriptExecutor) {
   visitor->trace(m_executor);
   SuspendableTimer::trace(visitor);
 }
 
 }  // namespace blink