DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/LayoutTests/inspector/sources/debugger-breakpoints/breakpoint-manager.js

 var initialize_BreakpointManagerTest = function() {
 
 InspectorTest.uiSourceCodes = {};
 
 InspectorTest.dumpTargetIds = false;
 
 InspectorTest.initializeDefaultMappingOnTarget = function(target)
 {
     var defaultMapping = {
         rawLocationToUILocation: function(rawLocation)
@@ skipping 239 matching lines @@
     persistentBreakpoints = persistentBreakpoints || [];
     var setting = {
         get: function() { return persistentBreakpoints; },
         set: function(breakpoints) { persistentBreakpoints = breakpoints; }
     };
 
     function breakpointAdded(event)
     {
         var breakpoint = event.data.breakpoint;
         var uiLocation = event.data.uiLocation;
-        InspectorTest.addResult("    breakpointAdded(" + [uiLocation.uiSourceCode.originURL(), uiLocation.lineNumber, uiLocation.columnNumber, breakpoint.condition(), breakpoint.enabled()].join(", ") + ")");
+        InspectorTest.addResult("    breakpointAdded(" + [uiLocation.uiSourceCode.url(), uiLocation.lineNumber, uiLocation.columnNumber, breakpoint.condition(), breakpoint.enabled()].join(", ") + ")");
     }
 
     function breakpointRemoved(event)
     {
         var uiLocation = event.data.uiLocation;
-        InspectorTest.addResult("    breakpointRemoved(" + [uiLocation.uiSourceCode.originURL(), uiLocation.lineNumber, uiLocation.columnNumber].join(", ") + ")");
+        InspectorTest.addResult("    breakpointRemoved(" + [uiLocation.uiSourceCode.url(), uiLocation.lineNumber, uiLocation.columnNumber].join(", ") + ")");
     }
     var targets = targetManager.targets();
     var mappingForManager;
     for (var i = 0; i < targets.length; ++i) {
         InspectorTest.initializeDefaultMappingOnTarget(targets[i]);
         if (!mappingForManager)
             mappingForManager = targets[i].defaultMapping;
     }
 
     var breakpointManager = new WebInspector.BreakpointManager(setting, debuggerWorkspaceBinding._workspace, debuggerWorkspaceBinding._networkMapping, targetManager, debuggerWorkspaceBinding);
     breakpointManager.defaultMapping = mappingForManager;
     breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, breakpointAdded);
     breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, breakpointRemoved);
     InspectorTest.addResult("  Created breakpoints manager");
     InspectorTest.dumpBreakpointStorage(breakpointManager);
     return breakpointManager;
 }
 
 InspectorTest.setBreakpoint = function(breakpointManager, uiSourceCode, lineNumber, columnNumber, condition, enabled, setBreakpointCallback)
 {
-    InspectorTest.addResult("  Setting breakpoint at " + uiSourceCode.originURL() + ":" + lineNumber + ":" + columnNumber + " enabled:" + enabled + " condition:" + condition);
+    InspectorTest.addResult("  Setting breakpoint at " + uiSourceCode.url() + ":" + lineNumber + ":" + columnNumber + " enabled:" + enabled + " condition:" + condition);
     if (setBreakpointCallback)
         window.setBreakpointCallback = setBreakpointCallback;
     return breakpointManager.setBreakpoint(uiSourceCode, lineNumber, columnNumber, condition, enabled);
 }
 
 InspectorTest.removeBreakpoint = function(breakpointManager, uiSourceCode, lineNumber, columnNumber)
 {
-    InspectorTest.addResult("  Removing breakpoint at " + uiSourceCode.originURL() + ":" + lineNumber + ":" + columnNumber);
+    InspectorTest.addResult("  Removing breakpoint at " + uiSourceCode.url() + ":" + lineNumber + ":" + columnNumber);
     breakpointManager.findBreakpoint(uiSourceCode, lineNumber, columnNumber).remove();
 }
 
 InspectorTest.dumpBreakpointStorage = function(breakpointManager)
 {
     var breakpoints = breakpointManager._storage._setting.get();
     InspectorTest.addResult("  Dumping Storage");
     for (var i = 0; i < breakpoints.length; ++i)
         InspectorTest.addResult("    " + breakpoints[i].sourceFileId + ":" + breakpoints[i].lineNumber  + " enabled:" + breakpoints[i].enabled + " condition:" + breakpoints[i].condition);
 }
 
 InspectorTest.dumpBreakpointLocations = function(breakpointManager)
 {
     var allBreakpointLocations = breakpointManager.allBreakpointLocations();
     InspectorTest.addResult("  Dumping Breakpoint Locations");
     var lastUISourceCode = null;
     var locations = [];
 
     function dumpLocations(uiSourceCode, locations)
     {
         locations.sort(function(a, b) {
             return a.lineNumber - b.lineNumber;
         });
         var networkURL = InspectorTest.testNetworkMapping.networkURL(uiSourceCode);
-        InspectorTest.addResult("    UISourceCode (url='" + networkURL + "', uri='" + uiSourceCode.uri() + "')");
+        InspectorTest.addResult("    UISourceCode (url='" + networkURL + "', uri='" + uiSourceCode.url() + "')");
         for (var i = 0; i < locations.length; ++i)
             InspectorTest.addResult("      Location: (" + locations[i].lineNumber + ", " + locations[i].columnNumber + ")");
     }
 
     for (var i = 0; i < allBreakpointLocations.length; ++i) {
         var uiLocation = allBreakpointLocations[i].uiLocation;
         var uiSourceCode = uiLocation.uiSourceCode;
         if (lastUISourceCode && lastUISourceCode != uiSourceCode) {
             dumpLocations(uiSourceCode, locations);
             locations = [];
@@ skipping 51 matching lines @@
     }
 
     function finish()
     {
         InspectorTest.dumpBreakpointLocations(breakpointManager);
         next();
     }
 }
 
 }