DevTools: merge uisourcecode's url-alike members.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.Linkifier.LinkHandler}
  */
 WebInspector.FrontendWebSocketAPI = function()
 {
@@ skipping 20 matching lines @@
     /**
      * @override
      * @param {string} url
      * @param {number=} lineNumber
      * @return {boolean}
      */
     handleLink: function(url, lineNumber)
     {
         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 });
             return true;
         }
         return false;
     },
 
     /**
      * @param {!WebInspector.Event} event
@@ skipping 34 matching lines @@
 
     /**
      * @param {!WebInspector.Event} event
      * @param {boolean=} saved
      */
     _workingCopyChanged: function(event, saved)
     {
         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() };
         if (saved)
             params.saved = true;
         this._issueFrontendAPINotification("Frontend.bufferUpdated", params);
     },
 
     /**
      * @param {!WebInspector.Event} event
@@ skipping 17 matching lines @@
 
     /**
      * @param {string} method
      * @param {?Object} params
      */
     _issueFrontendAPINotification: function(method, params)
     {
         InspectorFrontendHost.sendFrontendAPINotification(JSON.stringify({ method: method, params: params }));
     }
 }