Bug 1371339 - Don't install mozscreenshots in the mochitest extensions dir. r=glandium

MozReview-Commit-ID: BXYWAKyyLXp

--HG--
extra : rebase_source : 3377ae1b830d84c3b052373685ce7e3f7301bdbc

browser/tools/mozscreenshots/browser.ini

@@ -2,11 +2,5 @@
 subsuite = screenshots
 support-files =
   head.js
-  mozscreenshots/extension/lib/permissionPrompts.html
-  mozscreenshots/extension/lib/controlCenter/password.html
-  mozscreenshots/extension/lib/controlCenter/mixed.html
-  mozscreenshots/extension/lib/controlCenter/mixed_active.html
-  mozscreenshots/extension/lib/controlCenter/mixed_passive.html
-  mozscreenshots/extension/lib/borderify.xpi
 
 [browser_screenshots.js]

browser/tools/mozscreenshots/head.js

@@ -8,7 +8,7 @@
 
 const chromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);
 const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-const EXTENSION_DIR = "chrome://mochitests/content/extensions/mozscreenshots/browser/";
+const EXTENSION_DIR = "chrome://mochitests/content/browser/browser/tools/mozscreenshots/mozscreenshots/extension/mozscreenshots/browser/";
 
 let TestRunner;
 

browser/tools/mozscreenshots/mozscreenshots/extension/Makefile.in

@@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
-GENERATED_DIRS = $(TEST_EXTENSIONS_DIR)
+OUTPUT_DIR = $(DEPTH)/_tests/testing/mochitest/browser/browser/tools/mozscreenshots/mozscreenshots/extension
+GENERATED_DIRS = $(OUTPUT_DIR)
 XPI_PKGNAME = mozscreenshots@mozilla.org
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(TEST_EXTENSIONS_DIR) && tar -xf -)
+	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(OUTPUT_DIR) && tar -xf -)

browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm

@@ -16,7 +16,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 
 let {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
 
-const RESOURCE_PATH = "extensions/mozscreenshots/browser/chrome/mozscreenshots/lib/controlCenter";
+const RESOURCE_PATH = "browser/browser/tools/mozscreenshots/mozscreenshots/extension/mozscreenshots/browser/chrome/mozscreenshots/lib/controlCenter";
 const HTTP_PAGE = "http://example.com/";
 const HTTPS_PAGE = "https://example.com/";
 const PERMISSIONS_PAGE = "https://test1.example.com/";

browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm

@@ -13,7 +13,7 @@ Cu.import("resource:///modules/E10SUtils.jsm");
 Cu.import("resource://testing-common/ContentTask.jsm");
 Cu.import("resource://testing-common/BrowserTestUtils.jsm");
 
-const URL = "https://test1.example.com/extensions/mozscreenshots/browser/chrome/mozscreenshots/lib/permissionPrompts.html";
+const URL = "https://test1.example.com/browser/browser/tools/mozscreenshots/mozscreenshots/extension/mozscreenshots/browser/chrome/mozscreenshots/lib/permissionPrompts.html";
 let lastTab = null;
 
 this.PermissionPrompts = {