From 84109f9c5264beab5cff4ece3f9766cb7b5e106a Mon Sep 17 00:00:00 2001 From: steveck-chung Date: Fri, 10 Nov 2017 14:39:44 +0800 Subject: [PATCH] Bug 1022925 - Part 1: move addressReferences to addressmetadata folder. r=lchang,scottwu MozReview-Commit-ID: 4vRodOAyDdB --HG-- rename : browser/extensions/formautofill/content/addressReferences.js => browser/extensions/formautofill/addressmetadata/addressReferences.js extra : rebase_source : 69f1dd8be13d96da6209194aaa7c2d3bf53e3810 --- .../base/content/test/static/browser_all_files_referenced.js | 4 ++++ browser/extensions/formautofill/FormAutofillUtils.jsm | 2 +- .../{content => addressmetadata}/addressReferences.js | 0 browser/extensions/formautofill/jar.mn | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) rename browser/extensions/formautofill/{content => addressmetadata}/addressReferences.js (100%) diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js index 69cf9c2c1f3a..602dc584694d 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js @@ -30,6 +30,10 @@ var gExceptionPaths = [ // 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 diff --git a/browser/extensions/formautofill/FormAutofillUtils.jsm b/browser/extensions/formautofill/FormAutofillUtils.jsm index 68da47d30474..11a0740e96db 100644 --- a/browser/extensions/formautofill/FormAutofillUtils.jsm +++ b/browser/extensions/formautofill/FormAutofillUtils.jsm @@ -8,7 +8,7 @@ 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. diff --git a/browser/extensions/formautofill/content/addressReferences.js b/browser/extensions/formautofill/addressmetadata/addressReferences.js similarity index 100% rename from browser/extensions/formautofill/content/addressReferences.js rename to browser/extensions/formautofill/addressmetadata/addressReferences.js diff --git a/browser/extensions/formautofill/jar.mn b/browser/extensions/formautofill/jar.mn index cfa1d1e6e012..bd0a83c9b452 100644 --- a/browser/extensions/formautofill/jar.mn +++ b/browser/extensions/formautofill/jar.mn @@ -6,6 +6,7 @@ % resource formautofill %res/ res/ (*.jsm) res/phonenumberutils/ (phonenumberutils/*.jsm) + res/addressmetadata/ (addressmetadata/*) % content formautofill %content/ content/ (content/*)