Remove existingWindowShellWorkaroundWorld

Source/bindings/v8/ScriptController.cpp

Index: Source/bindings/v8/ScriptController.cpp
diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp
index 466d8738890c110f0b742d4c1223d0e525e0ca30..5f9762f8831e2fbeed2fc59ba1186023705262af 100644
--- a/Source/bindings/v8/ScriptController.cpp
+++ b/Source/bindings/v8/ScriptController.cpp
@@ -231,10 +231,6 @@ V8WindowShell* ScriptController::existingWindowShell(DOMWrapperWorld* world)
     if (world->isMainWorld())
         return m_windowShell->isContextInitialized() ? m_windowShell.get() : 0;
 
-    // FIXME: Remove this block. See comment with existingWindowShellWorkaroundWorld().
-    if (world == existingWindowShellWorkaroundWorld())
-        return m_windowShell.get();
-
     IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world->worldId());
     if (iter == m_isolatedWorlds.end())
         return 0;
@@ -258,14 +254,8 @@ V8WindowShell* ScriptController::windowShell(DOMWrapperWorld* world)
             m_isolatedWorlds.set(world->worldId(), isolatedWorldShell.release());
         }
     }
-    if (!shell->isContextInitialized() && shell->initializeIfNeeded()) {
-        if (world->isMainWorld()) {
-            // FIXME: Remove this if clause. See comment with existingWindowShellWorkaroundWorld().
-            m_frame->loader().dispatchDidClearWindowObjectInWorld(existingWindowShellWorkaroundWorld());
-        } else {
-            m_frame->loader().dispatchDidClearWindowObjectInWorld(world);
-        }
-    }
+    if (!shell->isContextInitialized() && shell->initializeIfNeeded())
+        m_frame->loader().dispatchDidClearWindowObjectInWorld(world);
     return shell;
 }