Make ScriptController inherit LocalWindowProxyManager

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

Index: third_party/WebKit/Source/bindings/core/v8/ToV8.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ToV8.cpp b/third_party/WebKit/Source/bindings/core/v8/ToV8.cpp
index 42889491ff216295e7912e8a80b7e652bf8828b5..d9223b8cca358377cdc5bacaa4e2c3188b38d13f 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ToV8.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ToV8.cpp
@@ -19,14 +19,8 @@ v8::Local<v8::Value> ToV8(DOMWindow* window,
 
   if (UNLIKELY(!window))
     return v8::Null(isolate);
-  // Initializes environment of a frame, and return the global object
-  // of the frame.
-  Frame* frame = window->frame();
-  if (!frame)
-    return v8Undefined();
-
-  return frame->windowProxy(DOMWrapperWorld::current(isolate))
-      ->globalIfNotDetached();
+
+  return window->globalProxy(DOMWrapperWorld::current(isolate));
 }
 
 v8::Local<v8::Value> ToV8(EventTarget* impl,