Bug 1022925 - Part 1: move addressReferences to addressmetadata folder. r=scottwu, lchang
MozReview-Commit-ID: 4vRodOAyDdB
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -25,16 +25,20 @@ var gExceptionPaths = [
// https://github.com/mozilla/activity-stream/issues/3053
"resource://activity-stream/data/content/tippytop/images/",
// https://github.com/mozilla/activity-stream/issues/3758
"resource://activity-stream/prerendered/",
// browser/extensions/pdfjs/content/build/pdf.js#1999
"resource://pdf.js/web/images/",
+
+ // Exclude all the metadata paths under the country metadata folder because these
+ // paths will be concatenated in FormAutofillUtils.jsm based on different country/region.
+ "resource://formautofill/addressmetadata/",
];
// These are not part of the omni.ja file, so we find them only when running
// the test on a non-packaged build.
if (AppConstants.platform == "macosx")
gExceptionPaths.push("resource://gre/res/cursors/");
var whitelist = [
--- a/browser/extensions/formautofill/FormAutofillUtils.jsm
+++ b/browser/extensions/formautofill/FormAutofillUtils.jsm
@@ -3,17 +3,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
this.EXPORTED_SYMBOLS = ["FormAutofillUtils"];
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-const ADDRESS_REFERENCES = "chrome://formautofill/content/addressReferences.js";
+const ADDRESS_REFERENCES = "resource://formautofill/addressmetadata/addressReferences.js";
// TODO: We only support US in MVP. We are going to support more countries in
// bug 1370193.
const ALTERNATIVE_COUNTRY_NAMES = {
"US": ["US", "United States of America", "United States", "America", "U.S.", "USA", "U.S.A.", "U.S.A"],
};
const ADDRESSES_COLLECTION_NAME = "addresses";
rename from browser/extensions/formautofill/content/addressReferences.js
rename to browser/extensions/formautofill/addressmetadata/addressReferences.js
--- a/browser/extensions/formautofill/jar.mn
+++ b/browser/extensions/formautofill/jar.mn
@@ -1,16 +1,17 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
[features/formautofill@mozilla.org] chrome.jar:
% resource formautofill %res/
res/ (*.jsm)
res/phonenumberutils/ (phonenumberutils/*.jsm)
+ res/addressmetadata/ (addressmetadata/*)
% content formautofill %content/
content/ (content/*)
% skin formautofill classic/1.0 %skin/linux/ os=LikeUnix
% skin formautofill classic/1.0 %skin/osx/ os=Darwin
% skin formautofill classic/1.0 %skin/windows/ os=WINNT
% skin formautofill-shared classic/1.0 %skin/shared/