DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

LayoutTests/http/tests/inspector/debugger-test.js

 var initialize_DebuggerTest = function() {
 
 InspectorTest.startDebuggerTest = function(callback, quiet)
 {
     if (quiet !== undefined)
         InspectorTest._quiet = quiet;
     WebInspector.inspectorView.showPanel("sources");
 
     if (WebInspector.debuggerModel.debuggerEnabled())
         startTest();
@@ skipping 77 matching lines @@
     InspectorTest.setQuiet(true);
     InspectorTest.startDebuggerTest(step1);
 
     function step1()
     {
         DebuggerAgent.setAsyncCallStackDepth(maxAsyncCallStackDepth, step2);
     }
 
     function step2()
     {
-        InspectorTest.runTestFunctionAndWaitUntilPaused(didPaused);
+        InspectorTest.runTestFunctionAndWaitUntilPaused(didPause);
     }
 
     var step = 0;
     var callStacksOutput = [];
-    function didPaused(callFrames, reason, breakpointIds, asyncStackTrace)
+    function didPause(callFrames, reason, breakpointIds, asyncStackTrace)
     {
         ++step;
         callStacksOutput.push(InspectorTest.captureStackTraceIntoString(callFrames, asyncStackTrace) + "\n");
         if (step < totalDebuggerStatements) {
-            InspectorTest.resumeExecution(InspectorTest.waitUntilPaused.bind(InspectorTest, didPaused));
+            InspectorTest.resumeExecution(InspectorTest.waitUntilPaused.bind(InspectorTest, didPause));
         } else {
             InspectorTest.addResult("Captured call stacks in no particular order:");
             callStacksOutput.sort();
             InspectorTest.addResults(callStacksOutput);
             InspectorTest.completeDebuggerTest();
         }
     }
 };
 
 InspectorTest.waitUntilPausedNextTime = function(callback)
@@ skipping 40 matching lines @@
 
 InspectorTest.captureStackTraceIntoString = function(callFrames, asyncStackTrace, options)
 {
     var results = [];
     options = options || {};
 
     function printCallFrames(callFrames)
     {
         for (var i = 0; i < callFrames.length; i++) {
             var frame = callFrames[i];
-            var script = WebInspector.debuggerModel.scriptForId(frame.location.scriptId);
+            var script = WebInspector.debuggerModel.scriptForId(frame.location().scriptId);
             var url;
             var lineNumber;
             if (script) {
                 url = WebInspector.displayNameForURL(script.sourceURL);
-                lineNumber = frame.location.lineNumber + 1;
+                lineNumber = frame.location().lineNumber + 1;
             } else {
                 url = "(internal script)";
                 lineNumber = "(line number)";
             }
             var s = "    " + i + ") " + frame.functionName + " (" + url + (options.dropLineNumbers ? "" : ":" + lineNumber) + ")";
             results.push(s);
-            if (options.printReturnValue && frame.returnValue)
-                results.push("       <return>: " + frame.returnValue.description);
+            if (options.printReturnValue && frame.returnValue())
+                results.push("       <return>: " + frame.returnValue().description);
         }
     }
 
     results.push("Call stack:");
     printCallFrames(callFrames);
 
     while (asyncStackTrace) {
         results.push("    [" + (asyncStackTrace.description || "Async Call") + "]");
-        printCallFrames(asyncStackTrace.callFrames);
+        printCallFrames(WebInspector.DebuggerModel.CallFrame.fromPayloadArray(WebInspector.targetManager.activeTarget(), asyncStackTrace.callFrames));
         if (asyncStackTrace.callFrames.peekLast().functionName === "testFunction")
             break;
         asyncStackTrace = asyncStackTrace.asyncStackTrace;
     }
     return results.join("\n");
 };
 
 InspectorTest.dumpSourceFrameContents = function(sourceFrame)
 {
     InspectorTest.addResult("==Source frame contents start==");
     var textEditor = sourceFrame._textEditor;
     for (var i = 0; i < textEditor.linesCount; ++i)
         InspectorTest.addResult(textEditor.line(i));
     InspectorTest.addResult("==Source frame contents end==");
 };
 
 InspectorTest._pausedScript = function(callFrames, reason, auxData, breakpointIds, asyncStackTrace)
 {
     if (!InspectorTest._quiet)
         InspectorTest.addResult("Script execution paused.");
-    InspectorTest._pausedScriptArguments = [callFrames, reason, breakpointIds, asyncStackTrace];
+    InspectorTest._pausedScriptArguments = [WebInspector.DebuggerModel.CallFrame.fromPayloadArray(WebInspector.targetManager.activeTarget(), callFrames), reason, breakpointIds, asyncStackTrace];
     if (InspectorTest._waitUntilPausedCallback) {
         var callback = InspectorTest._waitUntilPausedCallback;
         delete InspectorTest._waitUntilPausedCallback;
         callback.apply(callback, InspectorTest._pausedScriptArguments);
     }
 };
 
 InspectorTest._resumedScript = function()
 {
     if (!InspectorTest._quiet)
@@ skipping 134 matching lines @@
     return scripts;
 };
 
 InspectorTest.createScriptMock = function(url, startLine, startColumn, isContentScript, source)
 {
     var scriptId = ++InspectorTest._lastScriptId;
     var lineCount = source.lineEndings().length;
     var endLine = startLine + lineCount - 1;
     var endColumn = lineCount === 1 ? startColumn + source.length : source.length - source.lineEndings()[lineCount - 2];
     var hasSourceURL = !!source.match(/\/\/#\ssourceURL=\s*(\S*?)\s*$/m) || !!source.match(/\/\/@\ssourceURL=\s*(\S*?)\s*$/m);
-    var script = new WebInspector.Script(scriptId, url, startLine, startColumn, endLine, endColumn, isContentScript, null, hasSourceURL);
+    var script = new WebInspector.Script(WebInspector.targetManager.activeTarget(), scriptId, url, startLine, startColumn, endLine, endColumn, isContentScript, null, hasSourceURL);
     script.requestContent = function(callback)
     {
         var trimmedSource = WebInspector.Script._trimSourceURLComment(source);
         callback(trimmedSource, false, "text/javascript");
     };
     WebInspector.debuggerModel._registerScript(script);
     return script;
 };
 
 InspectorTest._lastScriptId = 0;
@@ skipping 16 matching lines @@
 InspectorTest.scriptFormatter = function()
 {
     var editorActions = WebInspector.moduleManager.instances(WebInspector.SourcesView.EditorAction);
     for (var i = 0; i < editorActions.length; ++i) {
         if (editorActions[i] instanceof WebInspector.ScriptFormatterEditorAction)
             return editorActions[i];
     }
 };
 
 };