DevTools: merge UISourceCode's parentPath, name, originURL and uri.

third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html

Index: third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
diff --git a/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html b/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
index a2844954b75917c34eca8b2d975a087e89e6cba2..f7db9ffee9d263c4ad785fffe792e41b96bc220c 100644
--- a/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
+++ b/third_party/WebKit/LayoutTests/inspector/sources/debugger/file-system-project-mapping.html
@@ -56,8 +56,8 @@ function test()
                 InspectorTest.addMockUISourceCodeViaNetwork("http://localhost/bar.js", WebInspector.resourceTypes.Script, "<foo content>");
                 dumpFileSystemUISourceCodesMappings();
 
-                var uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "html/foo.js");
-                networkUISourceCode = InspectorTest.testWorkspace.uiSourceCode(WebInspector.NetworkProject.projectId(target, "http://localhost"), "html/foo.js");
+                var uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "file:///var/www/html/foo.js");
+                networkUISourceCode = InspectorTest.testWorkspace.uiSourceCode(WebInspector.NetworkProject.projectId(target), "http://localhost/html/foo.js");

[dgozman, 2015/12/16 07:58:30]

...projectId(target, false)

[pfeldman, 2015/12/16 18:02:18]

Done.

                 InspectorTest.addResult("Adding mapping between network and file system resources.");
                 InspectorTest.testNetworkMapping.addMapping(networkUISourceCode, uiSourceCode);
                 var setting = JSON.stringify(WebInspector.fileSystemMapping._fileSystemMappingSetting.get());
@@ -77,7 +77,7 @@ function test()
                 dumpFileSystemUISourceCodesMappings();
 
                 InspectorTest.addResult("Removing mapping between network and file system resources.");
-                var uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "html/foo.js");
+                var uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "file:///var/www/html/foo.js");
                 InspectorTest.testNetworkMapping.removeMapping(uiSourceCode);
 
                 InspectorTest.addResult("Emulate reloading inspector.");
@@ -139,7 +139,7 @@ function test()
             {
                 loadScript();
 
-                uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "html/foo.js");
+                uiSourceCode = InspectorTest.testWorkspace.uiSourceCode(fileSystemProjectId, "file:///var/www/html/foo.js");
                 InspectorTest.showUISourceCode(uiSourceCode, didShowScriptSource);
             }