diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index de929f839d69..58916a60a29f 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -418,6 +418,7 @@ pref("dom.global-constructor.disable.mozContact", false);
pref("dom.phonenumber.substringmatching.BR", 8);
pref("dom.phonenumber.substringmatching.CO", 10);
pref("dom.phonenumber.substringmatching.VE", 7);
+pref("dom.phonenumber.substringmatching.CL", 8);
// WebAlarms
pref("dom.mozAlarms.enabled", true);
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index bf6e6b2572ab..23804b308d0e 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 4124da0c93d9..8ca672a82243 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 181154bda6bb..cce7839f36c2 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index bf6e6b2572ab..23804b308d0e 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 4309070c3883..9aa5b58445a2 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
"branch": "",
"revision": ""
},
- "revision": "4926fae1778461d93ff10b0fe4f8430246373e03",
+ "revision": "4dff379346b266bd93f48291a64cfc90af5d7daa",
"repo_path": "/integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b1e91ec9c464..ce457b7ec8a5 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index a040c6953f6b..8adbf6f2ae4f 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml
index b95824f5b1b8..e74c486856fe 100644
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml
index 26c6acef2769..434806c43128 100644
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml
index 381594d8a009..5ad0c5ee0864 100644
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 0ee445a1ceb9..53658498a03e 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build
index 7fd84f13e6ed..31639f793962 100644
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -8,10 +8,6 @@ SOURCES += [
'nsFeedSniffer.cpp',
]
-EXPORTS.mozilla += [
- 'FeedWriterEnabled.h',
-]
-
EXTRA_COMPONENTS += [
'BrowserFeeds.manifest',
'FeedConverter.js',
diff --git a/browser/components/feeds/src/FeedWriterEnabled.h b/content/base/src/FeedWriterEnabled.h
similarity index 100%
rename from browser/components/feeds/src/FeedWriterEnabled.h
rename to content/base/src/FeedWriterEnabled.h
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 82304b5f8ed0..d1d1e8e5c06d 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -53,6 +53,10 @@ if CONFIG['INTEL_ARCHITECTURE']:
SOURCES += ['nsTextFragmentSSE2.cpp']
SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+EXPORTS.mozilla += [
+ 'FeedWriterEnabled.h',
+]
+
EXPORTS.mozilla.dom += [
'Attr.h',
'Comment.h',
diff --git a/content/media/fmp4/demuxer/basictypes.h b/content/media/fmp4/demuxer/basictypes.h
index 7d876f4ea9ca..c37ab2705f10 100644
--- a/content/media/fmp4/demuxer/basictypes.h
+++ b/content/media/fmp4/demuxer/basictypes.h
@@ -25,7 +25,7 @@ namespace mp4_demuxer {
-#define OVERRIDE override
+#define OVERRIDE MOZ_OVERRIDE
#define WARN_UNUSED_RESULT
#define DCHECK(condition) \
diff --git a/dom/contacts/tests/mochitest.ini b/dom/contacts/tests/mochitest.ini
index 1c50ccd2c131..d1612db8eb5d 100644
--- a/dom/contacts/tests/mochitest.ini
+++ b/dom/contacts/tests/mochitest.ini
@@ -13,6 +13,7 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only failure
[test_contacts_international.html]
[test_contacts_substringmatching.html]
[test_contacts_substringmatchingVE.html]
+[test_contacts_substringmatchingCL.html]
[test_migration.html]
support-files =
test_migration_chrome.js
diff --git a/dom/contacts/tests/shared.js b/dom/contacts/tests/shared.js
index 41da27b2f77d..864dc34a6b7e 100644
--- a/dom/contacts/tests/shared.js
+++ b/dom/contacts/tests/shared.js
@@ -402,15 +402,17 @@ function next() {
}
}
+SimpleTest.waitForExplicitFinish();
+
function start_tests() {
// Skip tests on Android < 4.0 due to test failures on tbpl (see bugs 897924 & 888891)
let androidVersion = SpecialPowers.Cc['@mozilla.org/system-info;1']
.getService(SpecialPowers.Ci.nsIPropertyBag2)
.getProperty('version');
if (!isAndroid || androidVersion >= 14) {
- SimpleTest.waitForExplicitFinish();
- addLoadEvent(next);
+ next();
} else {
ok(true, "Skip tests on Android < 4.0 (bugs 897924 & 888891");
+ SimpleTest.finish();
}
}
diff --git a/dom/contacts/tests/test_contacts_international.html b/dom/contacts/tests/test_contacts_international.html
index e05c3b62671d..f01e21b903cb 100644
--- a/dom/contacts/tests/test_contacts_international.html
+++ b/dom/contacts/tests/test_contacts_international.html
@@ -43,13 +43,13 @@ var properties2 = {
};
var number3 = {
- international1: "0041557932012345",
- international2: "+557932012345"
+ local: "7932012345",
+ international: "+557932012345"
};
var properties3 = {
name: ["Testname2"],
- tel: [{value: number3.international2}]
+ tel: [{value: number3.international}]
};
var req;
@@ -95,9 +95,9 @@ var steps = [
filterValue: number1.local};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 1, "Found exactly 1 contact.");
+ ise(req.result.length, 1, "Found exactly 1 contact.");
findResult1 = req.result[0];
- ok(findResult1.id == sample_id1, "Same ID");
+ ise(findResult1.id, sample_id1, "Same ID");
next();
};
req.onerror = onFailure;
@@ -109,7 +109,7 @@ var steps = [
filterValue: number1.international};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 0, "Found exactly 0 contacts.");
+ ise(req.result.length, 0, "Found exactly 0 contacts.");
next();
};
req.onerror = onFailure;
@@ -122,7 +122,7 @@ var steps = [
filterValue: shortNumber};
req = mozContacts.find(options);
req.onsuccess = function() {
- ok(req.result.length == 0, "The prefix short number should not match any contact.");
+ ise(req.result.length, 0, "The prefix short number should not match any contact.");
next();
};
req.onerror = onFailure;
@@ -135,7 +135,7 @@ var steps = [
filterValue: shortNumber};
req = mozContacts.find(options);
req.onsuccess = function() {
- ok(req.result.length == 0, "The suffix short number should not match any contact.");
+ ise(req.result.length, 0, "The suffix short number should not match any contact.");
next();
};
req.onerror = onFailure;
@@ -147,7 +147,7 @@ var steps = [
filterValue: shortNumber};
req = mozContacts.find(options);
req.onsuccess = function() {
- ok(req.result.length == 1, "Found the contact equally matching the shortNumber.");
+ ise(req.result.length, 1, "Found the contact equally matching the shortNumber.");
next();
};
req.onerror = onFailure;
@@ -171,7 +171,7 @@ var steps = [
filterValue: number1.local};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 0, "Found exactly 0 contact.");
+ ise(req.result.length, 0, "Found exactly 0 contact.");
next();
};
req.onerror = onFailure;
@@ -183,7 +183,7 @@ var steps = [
filterValue: number1.international};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 0, "Found exactly 0 contact.");
+ ise(req.result.length, 0, "Found exactly 0 contact.");
next();
};
req.onerror = onFailure;
@@ -195,9 +195,9 @@ var steps = [
filterValue: number2.local};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 1, "Found exactly 1 contact.");
+ ise(req.result.length, 1, "Found exactly 1 contact.");
findResult1 = req.result[0];
- ok(findResult1.id == sample_id1, "Same ID");
+ ise(findResult1.id, sample_id1, "Same ID");
next();
};
req.onerror = onFailure;
@@ -209,7 +209,7 @@ var steps = [
filterValue: number2.international};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 0, "Found exactly 1 contact.");
+ ise(req.result.length, 0, "Found exactly 1 contact.");
next();
};
req.onerror = onFailure;
@@ -224,7 +224,7 @@ var steps = [
req.onerror = onFailure;
},
function () {
- ok(true, "Adding a new contact with country code");
+ ok(true, "Adding a contact with a Brazilian country code");
createResult1 = new mozContact(properties3);
req = navigator.mozContacts.save(createResult1);
req.onsuccess = function () {
@@ -235,15 +235,15 @@ var steps = [
req.onerror = onFailure;
},
function () {
- ok(true, "Searching for international number with prefix");
+ ok(true, "Searching for Brazilian number using local number");
var options = {filterBy: ["tel"],
filterOp: "match",
- filterValue: number3.international1};
+ filterValue: number3.local};
req = mozContacts.find(options);
req.onsuccess = function () {
- ok(req.result.length == 1, "Found exactly 1 contact.");
+ ise(req.result.length, 1, "Found exactly 1 contact.");
findResult1 = req.result[0];
- ok(findResult1.id == sample_id1, "Same ID");
+ ise(findResult1.id, sample_id1, "Same ID");
next();
};
req.onerror = onFailure;
@@ -263,7 +263,11 @@ var steps = [
}
];
-start_tests();
+SpecialPowers.pushPrefEnv({
+ set: [
+ ["ril.lastKnownSimMcc", "000"]
+ ]
+}, start_tests);
+
+Mozilla Bug 949537
+
+
+
+
+
+
+
+
+
diff --git a/dom/contacts/tests/test_contacts_substringmatching.html b/dom/contacts/tests/test_contacts_substringmatching.html
index dffbb4beab28..4e86166116dd 100644
--- a/dom/contacts/tests/test_contacts_substringmatching.html
+++ b/dom/contacts/tests/test_contacts_substringmatching.html
@@ -45,6 +45,15 @@ var prop4 = {
tel: [{ value: "(0414) 233-9888" }]
};
+var brazilianNumber = {
+ international1: "0041557932012345",
+ international2: "+557932012345"
+};
+
+var prop5 = {
+ tel: [{value: brazilianNumber.international2}]
+};
+
var req;
var steps = [
function () {
@@ -293,6 +302,40 @@ var steps = [
}
req.onerror = onFailure;
},
+ function () {
+ ok(true, "Adding a new contact with a Brazilian country code");
+ createResult1 = new mozContact(prop5);
+ req = navigator.mozContacts.save(createResult1);
+ req.onsuccess = function () {
+ ok(createResult1.id, "The contact now has an ID.");
+ sample_id1 = createResult1.id;
+ next();
+ };
+ req.onerror = onFailure;
+ },
+ function () {
+ ok(true, "Searching for international number with prefix");
+ var options = {filterBy: ["tel"],
+ filterOp: "match",
+ filterValue: brazilianNumber.international1};
+ req = mozContacts.find(options);
+ req.onsuccess = function () {
+ ok(req.result.length == 1, "Found exactly 1 contact.");
+ findResult1 = req.result[0];
+ ok(findResult1.id == sample_id1, "Same ID");
+ next();
+ };
+ req.onerror = onFailure;
+ },
+ function () {
+ ok(true, "Deleting database");
+ req = mozContacts.clear()
+ req.onsuccess = function () {
+ ok(true, "Deleted the database");
+ next();
+ }
+ req.onerror = onFailure;
+ },
function () {
ok(true, "all done!\n");
SpecialPowers.clearUserPref("dom.phonenumber.substringmatching.BR");
diff --git a/dom/contacts/tests/test_contacts_substringmatchingCL.html b/dom/contacts/tests/test_contacts_substringmatchingCL.html
new file mode 100644
index 000000000000..b248eefd8488
--- /dev/null
+++ b/dom/contacts/tests/test_contacts_substringmatchingCL.html
@@ -0,0 +1,204 @@
+
+
+
+