diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index d57010b42a99..5c2d5e4f0219 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -611,6 +611,8 @@ var settingsToObserve = {
},
'app.update.interval': 86400,
'apz.overscroll.enabled': true,
+ 'browser.safebrowsing.enabled': true,
+ 'browser.safebrowsing.malware.enabled': true,
'debug.fps.enabled': {
prefName: 'layers.acceleration.draw-fps',
defaultValue: false
diff --git a/b2g/config/aries-l/sources.xml b/b2g/config/aries-l/sources.xml
index 74a5e7de67d1..5a3717d400ae 100644
--- a/b2g/config/aries-l/sources.xml
+++ b/b2g/config/aries-l/sources.xml
@@ -21,15 +21,15 @@
-
-
+
+
-
+
-
+
@@ -38,15 +38,17 @@
-
+
+
+
@@ -139,7 +141,7 @@
-
+
@@ -169,7 +171,7 @@
-
+
diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 8269de90bb82..e0f83fc2406d 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -125,7 +125,7 @@
-
+
@@ -167,6 +167,7 @@
+
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 036cb1368e5e..60cf06fd10c8 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index b46aa6c6905b..40743334ab98 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 76081c837e55..8da32040df52 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -34,7 +34,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7a16e737df47..1af03bf1023c 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -37,7 +37,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index e979ab148238..f47ef5b9d5fc 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -21,15 +21,15 @@
-
-
+
+
-
+
-
+
@@ -37,15 +37,17 @@
-
+
+
+
@@ -139,7 +141,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index b46aa6c6905b..40743334ab98 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index e648cf29c05f..d4e5356b66e8 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -124,7 +124,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 6a1f29cfb969..f3d3c0b0bf04 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "eeedf205f728573c570c3b86f71d51916288bd04",
+ "git_revision": "a954bd2954c422b7d24d92cfd73000cb455dce44",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "8bec48f18dee7096595892f822f8807060999859",
+ "revision": "e9e8c44b43178139fca915cfe97ae3c52a9afe34",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml
index 4698633bb6ad..0b37e8658cfb 100644
--- a/b2g/config/nexus-4-kk/sources.xml
+++ b/b2g/config/nexus-4-kk/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 6321288bae00..76c1d5bbd8b8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -21,12 +21,12 @@
-
-
+
+
-
+
@@ -35,7 +35,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index d88738f81565..c381b7cfb235 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -21,15 +21,15 @@
-
-
+
+
-
+
-
+
@@ -38,15 +38,17 @@
-
+
+
+
@@ -140,7 +142,7 @@
-
+
@@ -154,7 +156,7 @@
-
+
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index b2e8719a6069..206c250d0530 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1018,6 +1018,11 @@