DevTools: remove WI.NetworkMapping.networkURL

third_party/WebKit/Source/devtools/front_end/Tests.js

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 339 matching lines @@
 
     function checkScriptsPanel() {
         test.assertTrue(test._scriptsAreParsed(["debugger_test_page.html"]), "Some scripts are missing.");
         checkNoDuplicates();
         test.releaseControl();
     }
 
     function checkNoDuplicates() {
         var uiSourceCodes = test.nonAnonymousUISourceCodes_();
         for (var i = 0; i < uiSourceCodes.length; i++) {
-            var scriptName = WebInspector.networkMapping.networkURL(uiSourceCodes[i]);
             for (var j = i + 1; j < uiSourceCodes.length; j++)
-                test.assertTrue(scriptName !== WebInspector.networkMapping.networkURL(uiSourceCodes[j]), "Found script duplicates: " + test.uiSourceCodesToString_(uiSourceCodes));
+                test.assertTrue(uiSourceCodes[i].url() !== uiSourceCodes[j].url(), "Found script duplicates: " + test.uiSourceCodesToString_(uiSourceCodes));
         }
     }
 
     this.showPanel("sources").then(function() {
         test._waitUntilScriptsAreParsed(
             ["debugger_test_page.html"],
             function() {
                 checkNoDuplicates();
                 setTimeout(switchToElementsTab, 0);
             });
@@ skipping 690 matching lines @@
 
 /**
  * Serializes array of uiSourceCodes to string.
  * @param {!Array.<!WebInspectorUISourceCode>} uiSourceCodes
  * @return {string}
  */
 TestSuite.prototype.uiSourceCodesToString_ = function(uiSourceCodes)
 {
     var names = [];
     for (var i = 0; i < uiSourceCodes.length; i++)
-        names.push('"' + WebInspector.networkMapping.networkURL(uiSourceCodes[i]) + '"');
+        names.push('"' + uiSourceCodes[i].url() + '"');
     return names.join(",");
 };
 
 
 /**
  * Returns all loaded non anonymous uiSourceCodes.
  * @return {!Array.<!WebInspectorUISourceCode>}
  */
 TestSuite.prototype.nonAnonymousUISourceCodes_ = function()
 {
-    function filterOutAnonymous(uiSourceCode)
-    {
-        return !!WebInspector.networkMapping.networkURL(uiSourceCode);
-    }
-
+    /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     */
     function filterOutService(uiSourceCode)
     {
         return !uiSourceCode.isFromServiceProject();
     }
 
     var uiSourceCodes = WebInspector.workspace.uiSourceCodes();
-    uiSourceCodes = uiSourceCodes.filter(filterOutService);
-    return uiSourceCodes.filter(filterOutAnonymous);
+    return uiSourceCodes.filter(filterOutService);
 };
 
 
 /*
  * Evaluates the code in the console as if user typed it manually and invokes
  * the callback when the result message is received and added to the console.
  * @param {string} code
  * @param {function(string)} callback
  */
 TestSuite.prototype.evaluateInConsole_ = function(code, callback)
@@ skipping 104 matching lines @@
 /**
  * Key event with given key identifier.
  */
 TestSuite.createKeyEvent = function(key)
 {
     return new KeyboardEvent("keydown", {bubbles: true, cancelable:true, key: key});
 };
 
 window.uiTests = new TestSuite(window.domAutomationController);
 })(window);