bindings: Simplifies WindowProxyManager and its relation to Frame.

third_party/WebKit/Source/bindings/core/v8/ScriptController.h

Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
index 010f7fecd1a94a6cd64ae1f898658c095c368db7..bac87405658d81d173a743ae1daed609f2b7234a 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
@@ -67,15 +67,17 @@ class CORE_EXPORT ScriptController final
     DoNotExecuteScriptWhenScriptsDisabled
   };
 
-  static ScriptController* create(LocalFrame* frame) {
-    return new ScriptController(frame);
+  static ScriptController* create(LocalWindowProxyManager* windowProxyManager) {
+    return new ScriptController(windowProxyManager);
   }
 
   DECLARE_TRACE();
 
   // This returns an initialized window proxy. (If the window proxy is not
   // yet initialized, it's implicitly initialized at the first access.)
-  LocalWindowProxy* windowProxy(DOMWrapperWorld&);
+  LocalWindowProxy* windowProxy(DOMWrapperWorld& world) {
+    return m_windowProxyManager->windowProxy(world);
+  }
 
   // Evaluate JavaScript in the main world.
   void executeScriptInMainWorld(
@@ -131,22 +133,18 @@ class CORE_EXPORT ScriptController final
   static void registerExtensionIfNeeded(v8::Extension*);
   static V8Extensions& registeredExtensions();
 
-  v8::Isolate* isolate() const { return m_windowProxyManager->isolate(); }
-
-  LocalWindowProxyManager* getWindowProxyManager() const {
-    return m_windowProxyManager.get();
-  }
-
  private:
-  explicit ScriptController(LocalFrame*);
+  explicit ScriptController(LocalWindowProxyManager* windowProxyManager)
+      : m_windowProxyManager(windowProxyManager) {}
 
   LocalFrame* frame() const { return m_windowProxyManager->frame(); }
+  v8::Isolate* isolate() const { return m_windowProxyManager->isolate(); }
 
   v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&,
                                                  AccessControlStatus,
                                                  ExecuteScriptPolicy);
 
-  Member<LocalWindowProxyManager> m_windowProxyManager;
+  const Member<LocalWindowProxyManager> m_windowProxyManager;
 };
 
 }  // namespace blink