DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js

Index: third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
index 959448a31e5cd1f60dff47a09f1df03a3b8c8d6c..a2d2e54955959321d2e7bf1000e4121626b910e5 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
@@ -112,7 +112,7 @@ WebInspector.JavaScriptSourceFrame.prototype = {
         var infobar = new WebInspector.UISourceCodeFrame.Infobar(WebInspector.Infobar.Type.Warning, WebInspector.UIString("Workspace mapping mismatch"));
         this._divergedInfobar = infobar;
 
-        var fileURL = this.uiSourceCode().originURL();
+        var fileURL = this.uiSourceCode().url();
         infobar.createDetailsRowMessage(WebInspector.UIString("The content of this file on the file system:\u00a0")).appendChild(
             WebInspector.linkifyURLAsNode(fileURL, fileURL, "source-frame-infobar-details-url", true));
 
@@ -148,7 +148,7 @@ WebInspector.JavaScriptSourceFrame.prototype = {
         if (projectType === WebInspector.projectTypes.Snippets)
             return;
         var networkURL = WebInspector.networkMapping.networkURL(this.uiSourceCode());
-        var url = projectType === WebInspector.projectTypes.Formatter ? this.uiSourceCode().originURL() : networkURL;
+        var url = projectType === WebInspector.projectTypes.Formatter ? this.uiSourceCode().url() : networkURL;

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

Suspicious change. Why formatter should use url instead?

[pfeldman, 2016/01/08 23:56:32]

We only generate formatted versions for network resources.

         var isContentScript = projectType === WebInspector.projectTypes.ContentScripts;
         if (!WebInspector.BlackboxSupport.isBlackboxed(url, isContentScript)) {
             this._hideBlackboxInfobar();