DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js

Index: third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
index a9a3bb9670885e75dc50ef79c2d7a883d8c8a927..6572eaabc61585b5214fe1f2d3a6d576560c306d 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js
@@ -77,9 +77,9 @@ WebInspector.NetworkMapping.prototype = {
     {
         if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem) {
             var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
-            return this._urlForPath(fileSystemPath, uiSourceCode.path());
+            return this._urlForPath(fileSystemPath, uiSourceCode.url());

[dgozman, 2016/01/08 20:22:06]

Calling urlForPath with url parameter is strange.

         }
-        return uiSourceCode.originURL();
+        return uiSourceCode.url();
     },
 
     /**
@@ -169,7 +169,7 @@ WebInspector.NetworkMapping.prototype = {
      */
     uiSourceCodeForURLForAnyTarget: function(url)
     {
-        return this._fileSystemUISourceCodeForURL(url) || WebInspector.workspace.uiSourceCodeForOriginURL(url);
+        return this._fileSystemUISourceCodeForURL(url) || WebInspector.workspace.uiSourceCodeForURL(url);
     },
 
     /**
@@ -189,7 +189,7 @@ WebInspector.NetworkMapping.prototype = {
     addMapping: function(networkUISourceCode, uiSourceCode)
     {
         var url = this.networkURL(networkUISourceCode);
-        var path = uiSourceCode.path();
+        var path = uiSourceCode.url();
         var fileSystemPath = this._fileSystemWorkspaceBinding.fileSystemPath(uiSourceCode.project().id());
         this._fileSystemMapping.addMappingForResource(url, fileSystemPath, path);
     },