diff --git a/mobile/chrome/tests/browser_bookmarks.js b/mobile/chrome/tests/browser_bookmarks.js index 37d9e01a0036..209898657692 100644 --- a/mobile/chrome/tests/browser_bookmarks.js +++ b/mobile/chrome/tests/browser_bookmarks.js @@ -4,8 +4,8 @@ * component, specifically for bookmark management. */ -var testURL_01 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; -var testURL_02 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_02.html"; +var testURL_01 = chromeRoot + "browser_blank_01.html"; +var testURL_02 = chromeRoot + "browser_blank_02.html"; // A queue to order the tests and a handle for each test var gTests = []; diff --git a/mobile/chrome/tests/browser_bookmarks_star.js b/mobile/chrome/tests/browser_bookmarks_star.js index 643e02bc9ce5..eea4fb0c443c 100644 --- a/mobile/chrome/tests/browser_bookmarks_star.js +++ b/mobile/chrome/tests/browser_bookmarks_star.js @@ -4,8 +4,8 @@ * component, specifically for bookmark management. */ -var testURL_01 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; -var testURL_02 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_02.html"; +var testURL_01 = chromeRoot + "browser_blank_01.html"; +var testURL_02 = chromeRoot + "browser_blank_02.html"; // A queue to order the tests and a handle for each test var gTests = []; diff --git a/mobile/chrome/tests/browser_bookmarks_tags.js b/mobile/chrome/tests/browser_bookmarks_tags.js index 8bb9a6109e59..4821b6af1e0c 100644 --- a/mobile/chrome/tests/browser_bookmarks_tags.js +++ b/mobile/chrome/tests/browser_bookmarks_tags.js @@ -4,8 +4,8 @@ * component, specifically for bookmark management. */ -var testURL_01 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; -var testURL_02 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_02.html"; +var testURL_01 = chromeRoot + "browser_blank_01.html"; +var testURL_02 = chromeRoot + "browser_blank_02.html"; // A queue to order the tests and a handle for each test var gTests = []; diff --git a/mobile/chrome/tests/browser_click_content.js b/mobile/chrome/tests/browser_click_content.js index 0fdff7b58471..0fd0ccc6ee72 100644 --- a/mobile/chrome/tests/browser_click_content.js +++ b/mobile/chrome/tests/browser_click_content.js @@ -1,4 +1,4 @@ -let testURL_click = "chrome://mochikit/content/browser/mobile/chrome/browser_click_content.html"; +let testURL_click = chromeRoot + "browser_click_content.html"; let currentTab; let element; diff --git a/mobile/chrome/tests/browser_forms.js b/mobile/chrome/tests/browser_forms.js index 3993d47e8c56..9e9e7bc2d875 100644 --- a/mobile/chrome/tests/browser_forms.js +++ b/mobile/chrome/tests/browser_forms.js @@ -1,5 +1,5 @@ -let testURL = "chrome://mochikit/content/browser/mobile/chrome/browser_forms.html"; -messageManager.loadFrameScript("chrome://mochikit/content/browser/mobile/chrome/remote_forms.js", true); +let testURL = chromeRoot + "browser_forms.html"; +messageManager.loadFrameScript(chromeRoot + "remote_forms.js", true); let newTab = null; let isLoading = function() { diff --git a/mobile/chrome/tests/browser_navigation.js b/mobile/chrome/tests/browser_navigation.js index b64dcbdf7704..a831fe2c9cd0 100644 --- a/mobile/chrome/tests/browser_navigation.js +++ b/mobile/chrome/tests/browser_navigation.js @@ -1,7 +1,7 @@ -var testURL_01 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; -var testURL_02 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_02.html"; -var testURL_03 = "chrome://mochikit/content/browser/mobile/chrome/browser_english_title.html"; -var testURL_04 = "chrome://mochikit/content/browser/mobile/chrome/browser_no_title.html"; +var testURL_01 = chromeRoot + "browser_blank_01.html"; +var testURL_02 = chromeRoot + "browser_blank_02.html"; +var testURL_03 = chromeRoot + "browser_english_title.html"; +var testURL_04 = chromeRoot + "browser_no_title.html"; var pngURL = "data:image/gif;base64,R0lGODlhCwALAIAAAAAA3pn/ZiH5BAEAAAEALAAAAAALAAsAAAIUhA+hkcuO4lmNVindo7qyrIXiGBYAOw=="; // A queue to order the tests and a handle for each test diff --git a/mobile/chrome/tests/browser_select.js b/mobile/chrome/tests/browser_select.js index eca47f8013d1..07ab3201ce48 100644 --- a/mobile/chrome/tests/browser_select.js +++ b/mobile/chrome/tests/browser_select.js @@ -1,4 +1,4 @@ -let testURL = "chrome://mochikit/content/browser/mobile/chrome/browser_select.html"; +let testURL = chromeRoot + "browser_select.html"; let new_tab = null; //------------------------------------------------------------------------------ diff --git a/mobile/chrome/tests/browser_sessionstore.js b/mobile/chrome/tests/browser_sessionstore.js index 39deae32878e..a55cacc568ce 100644 --- a/mobile/chrome/tests/browser_sessionstore.js +++ b/mobile/chrome/tests/browser_sessionstore.js @@ -1,4 +1,4 @@ -var testURL = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; +var testURL = chromeRoot + "browser_blank_01.html"; // A queue to order the tests and a handle for each test var gTests = []; diff --git a/mobile/chrome/tests/browser_tabs.js b/mobile/chrome/tests/browser_tabs.js index 09ec251f1279..a2661de5237d 100755 --- a/mobile/chrome/tests/browser_tabs.js +++ b/mobile/chrome/tests/browser_tabs.js @@ -1,6 +1,6 @@ -let testURL_01 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; -let testURL_02 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_02.html"; -let testURL_03 = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html#tab3"; +let testURL_01 = chromeRoot + "browser_blank_01.html"; +let testURL_02 = chromeRoot + "browser_blank_02.html"; +let testURL_03 = chromeRoot + "browser_blank_01.html#tab3"; let new_tab_01; let new_tab_02; diff --git a/mobile/chrome/tests/browser_tapping.js b/mobile/chrome/tests/browser_tapping.js index 1432bc3784bc..5fd9fb870d28 100644 --- a/mobile/chrome/tests/browser_tapping.js +++ b/mobile/chrome/tests/browser_tapping.js @@ -3,7 +3,7 @@ * single tap, double tap & long tap */ -let testURL = "chrome://mochikit/content/browser/mobile/chrome/browser_tap_content.html"; +let testURL = chromeRoot + "browser_tap_content.html"; let gTests = []; let gCurrentTest = null; diff --git a/mobile/chrome/tests/browser_viewport.js b/mobile/chrome/tests/browser_viewport.js index c705e2ea11d8..78fa351dc293 100644 --- a/mobile/chrome/tests/browser_viewport.js +++ b/mobile/chrome/tests/browser_viewport.js @@ -38,10 +38,9 @@ * * ***** END LICENSE BLOCK ***** */ - -let testURL_blank = "chrome://mochikit/content/browser/mobile/chrome/browser_blank_01.html"; +let testURL_blank = chromeRoot + "browser_blank_01.html"; let testURL = function testURL(n) { - return "chrome://mochikit/content/browser/mobile/chrome/browser_viewport_" + + return chromeRoot + "browser_viewport_" + (n<10 ? "0" : "") + n + ".html"; } diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js index 18d9505aab43..5b009e8409de 100644 --- a/mobile/chrome/tests/head.js +++ b/mobile/chrome/tests/head.js @@ -67,5 +67,6 @@ let AsyncTests = { } }; -messageManager.loadFrameScript("chrome://mochikit/content/browser/mobile/chrome/remote_head.js", true); +let chromeRoot = getRootDirectory(gTestPath); +messageManager.loadFrameScript(chromeRoot + "remote_head.js", true); messageManager.loadFrameScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", true);