Remove ScriptObject

Source/core/inspector/InjectedScriptBase.cpp

Index: Source/core/inspector/InjectedScriptBase.cpp
diff --git a/Source/core/inspector/InjectedScriptBase.cpp b/Source/core/inspector/InjectedScriptBase.cpp
index cf05edd354eb3fb97b18319ee1579c3c77183a3b..f9fcff6367eef2feb55ff2110776d2885aafe253 100644
--- a/Source/core/inspector/InjectedScriptBase.cpp
+++ b/Source/core/inspector/InjectedScriptBase.cpp
@@ -49,38 +49,38 @@ InjectedScriptBase::InjectedScriptBase(const String& name)
 {
 }
 
-InjectedScriptBase::InjectedScriptBase(const String& name, ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+InjectedScriptBase::InjectedScriptBase(const String& name, ScriptValue injectedScriptValue, InspectedStateAccessCheck accessCheck)
     : m_name(name)
-    , m_injectedScriptObject(injectedScriptObject)
+    , m_injectedScriptValue(injectedScriptValue)
     , m_inspectedStateAccessCheck(accessCheck)
 {
 }
 
-void InjectedScriptBase::initialize(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+void InjectedScriptBase::initialize(ScriptValue injectedScriptValue, InspectedStateAccessCheck accessCheck)
 {
-    m_injectedScriptObject = injectedScriptObject;
+    m_injectedScriptValue = injectedScriptValue;
     m_inspectedStateAccessCheck = accessCheck;
 }
 
 bool InjectedScriptBase::canAccessInspectedWindow() const
 {
-    return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
+    return m_inspectedStateAccessCheck(m_injectedScriptValue.scriptState());
 }
 
-const ScriptObject& InjectedScriptBase::injectedScriptObject() const
+const ScriptValue& InjectedScriptBase::injectedScriptValue() const
 {
-    return m_injectedScriptObject;
+    return m_injectedScriptValue;
 }
 
 ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
 {
-    ExecutionContext* executionContext = m_injectedScriptObject.scriptState()->executionContext();
+    ExecutionContext* executionContext = m_injectedScriptValue.scriptState()->executionContext();
     TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, 0, name(), 1));
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
     // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(executionContext, 0, name(), 1);
 
-    ScriptState* scriptState = m_injectedScriptObject.scriptState();
+    ScriptState* scriptState = m_injectedScriptValue.scriptState();
     bool evalIsDisabled = false;
     if (scriptState) {
         evalIsDisabled = !scriptState->evalEnabled();
@@ -111,7 +111,7 @@ void InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue
 
     ASSERT(!hadException);
     if (!hadException) {
-        *result = resultValue.toJSONValue(m_injectedScriptObject.scriptState());
+        *result = resultValue.toJSONValue(m_injectedScriptValue.scriptState());
         if (!*result)
             *result = JSONString::create(String::format("Object has too long reference chain(must not be longer than %d)", JSONValue::maxDepth));
     } else {