DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/LayoutTests/http/tests/inspector/workspace-test.js

 var initialize_WorkspaceTest = function() {
 
 InspectorTest.createWorkspace = function(ignoreEvents)
 {
     if (InspectorTest.testFileSystemWorkspaceBinding)
         InspectorTest.testFileSystemWorkspaceBinding.dispose();
     if (InspectorTest.testNetworkMapping)
         InspectorTest.testNetworkMapping.dispose();
     WebInspector.fileSystemMapping.resetForTesting();
 
@@ skipping 114 matching lines @@
 }
 
 InspectorTest._defaultWorkspaceEventHandler = function(event)
 {
     var uiSourceCode = event.data;
     var networkURL = WebInspector.networkMapping.networkURL(uiSourceCode);
     if (uiSourceCode.project().type() === WebInspector.projectTypes.Debugger && !networkURL)
         return;
     if (uiSourceCode.project().type() === WebInspector.projectTypes.Service)
         return;
-    InspectorTest.addResult("Workspace event: " + event.type + ": " + uiSourceCode.uri() + ".");
+    InspectorTest.addResult("Workspace event: " + event.type + ": " + uiSourceCode.url() + ".");
 }
 
 InspectorTest.uiSourceCodeURL = function(uiSourceCode)
 {
-    return uiSourceCode.originURL().replace(/.*LayoutTests/, "LayoutTests");
+    return uiSourceCode.url().replace(/.*LayoutTests/, "LayoutTests");
 }
 
 InspectorTest.dumpUISourceCode = function(uiSourceCode, callback)
 {
     InspectorTest.addResult("UISourceCode: " + InspectorTest.uiSourceCodeURL(uiSourceCode));
     if (uiSourceCode.contentType() === WebInspector.resourceTypes.Script || uiSourceCode.contentType() === WebInspector.resourceTypes.Document)
         InspectorTest.addResult("UISourceCode is content script: " + (uiSourceCode.project().type() === WebInspector.projectTypes.ContentScripts));
     uiSourceCode.requestContent(didRequestContent);
 
     function didRequestContent(content, contentEncoded)
@@ skipping 36 matching lines @@
     function uiSourceCodeAdded(event)
     {
         if (event.data.name() === name) {
             WebInspector.workspace.removeEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, uiSourceCodeAdded);
             setImmediate(callback);
         }
     }
 }
 
 };