DevTools: rebaseline inspector tests with poor expectations (2).

Source/core/inspector/InjectedScriptBase.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 124 matching lines @@
 
 const ScriptValue& InjectedScriptBase::injectedScriptObject() const
 {
     return m_injectedScriptObject;
 }
 
 ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
 {
     ASSERT(!isEmpty());
     ExecutionContext* executionContext = m_injectedScriptObject.scriptState()->executionContext();
-    TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, 0, name(), 1));
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(executionContext, DevToolsFunctionInfo(0, name(), 1));
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    v8::Handle<v8::Function> functionObj = function.function();
+    DevToolsFunctionInfo info(functionObj);
+    TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, info.scriptId(), info.resourceName(), info.lineNumber()));
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(executionContext, info);
 
     ScriptState* scriptState = m_injectedScriptObject.scriptState();
     bool evalIsDisabled = false;
     if (scriptState) {
         evalIsDisabled = !scriptState->evalEnabled();
         // Temporarily enable allow evals for inspector.
         if (evalIsDisabled)
             scriptState->setEvalEnabled(true);
     }
 
@@ skipping 54 matching lines @@
     if (wasThrownVal) {
         RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("exceptionDetails");
         if (objectExceptionDetails)
             *exceptionDetails = toExceptionDetails(objectExceptionDetails.release());
     }
     *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
     *wasThrown = wasThrownVal;
 }
 
 } // namespace blink