Remove ScriptObject

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 eeff322fe0d07d5f30a9f8196d6d8319a5dd5d04..c42f4f062f46932cda90183d9069dcaf37fdda06 100644
--- a/Source/bindings/v8/ScriptController.cpp
+++ b/Source/bindings/v8/ScriptController.cpp
@@ -355,25 +355,25 @@ void ScriptController::registerExtensionIfNeeded(v8::Extension* extension)
     registeredExtensions().append(extension);
 }
 
-static NPObject* createNoScriptObject()
+static NPObject* createNoScriptValue()
 {
     notImplemented();
     return 0;
 }
 
-static NPObject* createScriptObject(LocalFrame* frame, v8::Isolate* isolate)
+static NPObject* createScriptValue(LocalFrame* frame, v8::Isolate* isolate)
 {
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Context> v8Context = toV8Context(isolate, frame, DOMWrapperWorld::mainWorld());
     if (v8Context.IsEmpty())
-        return createNoScriptObject();
+        return createNoScriptValue();
 
     v8::Context::Scope scope(v8Context);
     DOMWindow* window = frame->domWindow();
     v8::Handle<v8::Value> global = toV8(window, v8::Handle<v8::Object>(), v8Context->GetIsolate());
     ASSERT(global->IsObject());
 
-    return npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(global), window, isolate);
+    return npCreateV8ScriptValue(0, v8::Handle<v8::Object>::Cast(global), window, isolate);
 }
 
 NPObject* ScriptController::windowScriptNPObject()
@@ -384,13 +384,13 @@ NPObject* ScriptController::windowScriptNPObject()
     if (canExecuteScripts(NotAboutToExecuteScript)) {
         // JavaScript is enabled, so there is a JavaScript window object.
         // Return an NPObject bound to the window object.
-        m_windowScriptNPObject = createScriptObject(m_frame, m_isolate);
+        m_windowScriptNPObject = createScriptValue(m_frame, m_isolate);
         _NPN_RegisterObject(m_windowScriptNPObject, 0);
     } else {
         // JavaScript is not enabled, so we cannot bind the NPObject to the
         // JavaScript window object. Instead, we create an NPObject of a
         // different class, one which is not bound to a JavaScript object.
-        m_windowScriptNPObject = createNoScriptObject();
+        m_windowScriptNPObject = createNoScriptValue();
     }
     return m_windowScriptNPObject;
 }
@@ -399,20 +399,20 @@ NPObject* ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement
 {
     // Can't create NPObjects when JavaScript is disabled.
     if (!canExecuteScripts(NotAboutToExecuteScript))
-        return createNoScriptObject();
+        return createNoScriptValue();
 
     v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Context> v8Context = toV8Context(m_isolate, m_frame, DOMWrapperWorld::mainWorld());
     if (v8Context.IsEmpty())
-        return createNoScriptObject();
+        return createNoScriptValue();
     v8::Context::Scope scope(v8Context);
 
     DOMWindow* window = m_frame->domWindow();
     v8::Handle<v8::Value> v8plugin = toV8(plugin, v8::Handle<v8::Object>(), v8Context->GetIsolate());
     if (!v8plugin->IsObject())
-        return createNoScriptObject();
+        return createNoScriptValue();
 
-    return npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(v8plugin), window, v8Context->GetIsolate());
+    return npCreateV8ScriptValue(0, v8::Handle<v8::Object>::Cast(v8plugin), window, v8Context->GetIsolate());
 }
 
 void ScriptController::clearWindowShell()