DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/LayoutTests/inspector/file-system-project.html

Index: third_party/WebKit/LayoutTests/inspector/file-system-project.html
diff --git a/third_party/WebKit/LayoutTests/inspector/file-system-project.html b/third_party/WebKit/LayoutTests/inspector/file-system-project.html
index d468b9e006909864bd5a3befa66c5b3be3857200..8db14a9c6f93b7004bb690444070d14174f8b425 100644
--- a/third_party/WebKit/LayoutTests/inspector/file-system-project.html
+++ b/third_party/WebKit/LayoutTests/inspector/file-system-project.html
@@ -38,7 +38,7 @@ function test()
         InspectorTest.addResult("Dumping uiSourceCodes origin URLs:");
         var uiSourceCodes = InspectorTest.fileSystemUISourceCodes();
         for (var i = 0; i < uiSourceCodes.length; ++i)
-            InspectorTest.addResult("  - " + uiSourceCodes[i].originURL());
+            InspectorTest.addResult("  - " + uiSourceCodes[i].url());
     }
 
     function createFileSystem(name, callback)
@@ -94,14 +94,14 @@ function test()
                     var url = WebInspector.networkMapping.networkURL(uiSourceCodes[i]);
                     if (!url)
                         continue;
-                    InspectorTest.addResult("    " + uiSourceCodes[i].uri() + " -> " + url);
+                    InspectorTest.addResult("    " + uiSourceCodes[i].url() + " -> " + url);
                 }
                 InspectorTest.addResult("UISourceCode url to uri mappings:");
                 for (var i = 0; i < uiSourceCodes.length; ++i) {
                     var url = WebInspector.networkMapping.networkURL(uiSourceCodes[i]);
                     if (!url)
                         continue;
-                    var uri = WebInspector.networkMapping.uiSourceCodeForURLForAnyTarget(url).uri();
+                    var uri = WebInspector.networkMapping.uiSourceCodeForURLForAnyTarget(url).url();
                     InspectorTest.addResult("    " + url + " -> " + uri);
                 }
                 WebInspector.workspace.addEventListener(WebInspector.Workspace.Events.WorkingCopyCommitted, contentCommitted, this);