DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js

Index: third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js
diff --git a/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js b/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js
index 322da62e74f7b888cf900afcc105e26c16e12622..14afcbe32892be65f1b7fa4f22c02d5e426f0ecb 100644
--- a/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js
+++ b/third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js
@@ -38,7 +38,7 @@ WebInspector.FrontendWebSocketAPI.prototype = {
     {
         var uiSourceCode = WebInspector.networkMapping.uiSourceCodeForURLForAnyTarget(url);
         if (uiSourceCode)
-            url = uiSourceCode.originURL();
+            url = uiSourceCode.url();

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

Kill this file already!

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

Separate patch.

         if (url.startsWith("file://")) {
             var file = url.substring(7);
             this._issueFrontendAPINotification("Frontend.revealLocation", { file: file, line: lineNumber });
@@ -93,7 +93,7 @@ WebInspector.FrontendWebSocketAPI.prototype = {
         if (this._dispatchingFrontendMessage)
             return;
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data["uiSourceCode"]);
-        var url = uiSourceCode.originURL();
+        var url = uiSourceCode.url();
         if (url.startsWith("file://"))
             url = url.substring(7);
         var params = { file: url, buffer: uiSourceCode.workingCopy() };