Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp

Index: third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
index ae873c5690e21dddfc68d97710c5a4de9e01ecd7..f41828eb81cd2e3b058e8572a5e038dbc26be5b6 100644
--- a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
@@ -304,11 +304,7 @@ void LocalWindowProxy::namedItemAdded(HTMLDocument* document,
   DCHECK(m_world->isMainWorld());
 
   // Context must be initialized before this point.
-  DCHECK(m_lifecycle >= Lifecycle::ContextInitialized);
-  // TODO(yukishiino): Is it okay to not update named properties
-  // after the context gets detached?
-  if (m_lifecycle == Lifecycle::ContextDetached)
-    return;
+  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Object> documentWrapper =
@@ -324,12 +320,7 @@ void LocalWindowProxy::namedItemRemoved(HTMLDocument* document,
                                         const AtomicString& name) {
   DCHECK(m_world->isMainWorld());
 
-  // Context must be initialized before this point.
-  DCHECK(m_lifecycle >= Lifecycle::ContextInitialized);
-  // TODO(yukishiino): Is it okay to not update named properties
-  // after the context gets detached?
-  if (m_lifecycle == Lifecycle::ContextDetached)
-    return;
+  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
 
   if (document->hasNamedItem(name) || document->hasExtraNamedItem(name))
     return;