DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/LayoutTests/http/tests/inspector/search/search-test.js

 // To ensure that no GC-able resources from other tests upset
 // expectations, perform an initial GC.
 if (window.GCController)
     GCController.collect();
 
 var initialize_SearchTest = function() {
 InspectorTest.dumpSearchResults = function(searchResults)
 {
     function comparator(a, b)
     {
@@ skipping 23 matching lines @@
 
     function searchResultCallback(searchResult)
     {
         searchResults.push(searchResult);
     }
 
     function searchFinishedCallback()
     {
         function comparator(searchResultA, searchResultB)
         {
-            return searchResultA.uiSourceCode.uri().compareTo(searchResultB.uiSourceCode.uri());
+            return searchResultA.uiSourceCode.url().compareTo(searchResultB.uiSourceCode.url());
         }
         if (sortByURI)
             searchResults.sort(comparator);
 
         for (var i = 0; i < searchResults.length; ++i) {
             var searchResult = searchResults[i];
             var uiSourceCode = searchResult.uiSourceCode;
             var searchMatches = searchResult.searchMatches;
 
             if (!searchMatches.length)
                 continue;
-            InspectorTest.addResult("Search result #" + (i + 1) + ": uiSourceCode.uri = " + uiSourceCode.uri());
+            InspectorTest.addResult("Search result #" + (i + 1) + ": uiSourceCode.url = " + uiSourceCode.url());
             for (var j = 0; j < searchMatches.length; ++j) {
                 var lineNumber = searchMatches[j].lineNumber;
                 var lineContent = searchMatches[j].lineContent;
                 InspectorTest.addResult("  search match #" + (j + 1) + ": lineNumber = " + lineNumber + ", lineContent = '" + lineContent + "'");
             }
         }
         callback();
     }
 }
 
@@ skipping 47 matching lines @@
             ++postfixLength;
         var prefix = oldLine.substring(0, prefixLength);
         var removed = oldLine.substring(prefixLength, oldLine.length - postfixLength);
         var added = newLine.substring(prefixLength, newLine.length - postfixLength);
         var postfix = oldLine.substring(oldLine.length - postfixLength);
         InspectorTest.addResult("  - " + prefix + "#" + removed + "#" + added + "#" + postfix);
     }
 }
 
 };