diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index cc7fa7cb41f3..3de79eb06171 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 4b919b1533d6..f232e633678d 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 617395670e3f..ccc17a7f4123 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 cc7fa7cb41f3..3de79eb06171 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 06b4eb1fff7c..e93c0497e532 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 132dca1bb87f..4c464de70e12 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
- "revision": "949df3be29b432b53a4ee232e7fd19881b5aca6b",
+ "revision": "16672d155555bc730d998621efe34f2b5bbd66b7",
"repo_path": "/integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 63c6c08cc0dc..87ee8db83a5a 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 28c6c1526acd..d3993cc8acf8 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 3b474e67f080..ec2681791345 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 571c5bd50f1c..841a10e8ef49 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 83a87bd15309..7d828f7b02c2 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 89034a035233..a941ff0258ba 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index 809191843682..bd12cd818170 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -8,7 +8,7 @@ support-files =
NetworkPreparationChromeScript.js
[test_dataChannel_basicAudio.html]
-skip-if = (toolkit == 'gonk' && debug) #Bug 962984, test fail on b2g debug build
+skip-if = toolkit == 'gonk' #Bug 962984 for debug, bug 963244 for opt
[test_dataChannel_basicAudioVideo.html]
# Disabled on OS X for bug 930481 timeouts
skip-if = os == 'mac' || toolkit=='gonk' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) b2g-debug(Bug 960442, video support for WebRTC is disabled on b2g)
diff --git a/mobile/android/base/EventDispatcher.java b/mobile/android/base/EventDispatcher.java
index 8c2f2c20633d..906993304d9c 100644
--- a/mobile/android/base/EventDispatcher.java
+++ b/mobile/android/base/EventDispatcher.java
@@ -6,7 +6,6 @@ package org.mozilla.gecko;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
-import org.mozilla.gecko.mozglue.RobocopTarget;
import org.mozilla.gecko.util.EventCallback;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.util.NativeEventListener;
@@ -209,7 +208,6 @@ public final class EventDispatcher {
}
}
- @RobocopTarget
@Deprecated
public static void sendResponse(JSONObject message, Object response) {
sendResponseHelper(STATUS_SUCCESS, message, response);
diff --git a/mobile/android/base/tests/StringHelper.java b/mobile/android/base/tests/StringHelper.java
index 694f80b2680e..35920b728ad2 100644
--- a/mobile/android/base/tests/StringHelper.java
+++ b/mobile/android/base/tests/StringHelper.java
@@ -92,7 +92,6 @@ public class StringHelper {
public static final String ROBOCOP_SEARCH_TITLE = "Robocop Search Engine";
public static final String ROBOCOP_TEXT_PAGE_TITLE = "Robocop Text Page";
public static final String ROBOCOP_INPUT_TITLE = "Robocop Input";
- public static final String ROBOCOP_SELECTION_HANDLER_TITLE = "Automated Text Selection tests for Mobile";
// Settings menu strings
// Section labels - ordered as found in the settings menu
diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini
index 101a4bd2f651..73efd8c428de 100644
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -81,7 +81,6 @@ skip-if = android_version == "10"
[testPrefsObserver]
[testPrivateBrowsing]
[testPromptGridInput]
-[testSelectionHandler]
# disabled on x86 only; bug 957185
skip-if = processor == "x86"
# [testReaderMode] # see bug 913254, 936224
diff --git a/mobile/android/base/tests/roboextender/testSelectionHandler.html b/mobile/android/base/tests/roboextender/testSelectionHandler.html
deleted file mode 100644
index a077a5f2c769..000000000000
--- a/mobile/android/base/tests/roboextender/testSelectionHandler.html
+++ /dev/null
@@ -1,301 +0,0 @@
-
-
- Automated Text Selection tests for Mobile
-
-
-
-
-
-
-
-
Under sufficiently extreme conditions, quarks may become
- deconfined and exist as free particles. In the course of asymptotic freedom,
- the strong interaction becomes weaker at higher temperatures. Eventually,
- color confinement would be lost and an extremely hot plasma of freely moving
- quarks and gluons would be formed. This theoretical phase of matter is called
- quark-gluon plasma.[81] The exact conditions needed to give rise to this state
- are unknown and have been the subject of a great deal of speculation and
- experimentation. A recent estimate puts the needed temperature at
- (1.90±0.02)×1012 Kelvin. While a state of entirely free quarks and gluons has
- never been achieved (despite numerous attempts by CERN in the 1980s and 1990s),
- recent experiments at the Relativistic Heavy Ion Collider have yielded evidence
- for liquid-like quark matter exhibiting "nearly perfect" fluid motion.
-
-
Lorem ipsum dolor sit amet,
- consectetur adipiscing elit. Proin in blandit magna, non porttitor augue.
- Nam in neque sagittis, varius augue at, ornare velit. Vestibulum eget nisl
- congue odio molestie scelerisque. Pellentesque ut augue orci. In hac habitasse
- platea dictumst. Sed placerat tellus quis lacus condimentum, quis luctus elit
- pellentesque. Mauris cursus neque diam, sit amet gravida quam porta ac.
- Aliquam aliquam feugiat vestibulum. Proin commodo nulla ligula, in bibendum
- massa euismod a. Ut ac lobortis dui. Ut id augue id arcu ornare suscipit eu
- ornare lorem. Pellentesque nec dictum ante. Nam quis ligula ultricies, auctor
- nunc vel, fringilla turpis. Nulla lacinia, leo ut egestas hendrerit, risus
- ligula interdum enim, vel varius libero sem ut ligula.
-
-
-
-
-
-
-
diff --git a/mobile/android/base/tests/testSelectionHandler.java b/mobile/android/base/tests/testSelectionHandler.java
deleted file mode 100644
index 5684bafd582e..000000000000
--- a/mobile/android/base/tests/testSelectionHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.mozilla.gecko.tests;
-
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.tests.helpers.GeckoHelper;
-import org.mozilla.gecko.tests.helpers.NavigationHelper;
-
-import android.util.Log;
-
-import org.json.JSONObject;
-
-
-public class testSelectionHandler extends UITest {
-
- public void testSelectionHandler() {
- GeckoHelper.blockForReady();
-
- Actions.EventExpecter robocopTestExpecter = getActions().expectGeckoEvent("Robocop:testSelectionHandler");
- NavigationHelper.enterAndLoadUrl("chrome://roboextender/content/testSelectionHandler.html");
- mToolbar.assertTitle(StringHelper.ROBOCOP_SELECTION_HANDLER_TITLE);
-
- while (!test(robocopTestExpecter)) {
- // do nothing
- }
-
- robocopTestExpecter.unregisterListener();
- }
-
- private boolean test(Actions.EventExpecter expecter) {
- final JSONObject eventData;
- try {
- eventData = new JSONObject(expecter.blockForEventData());
- } catch(Exception ex) {
- // Log and ignore
- getAsserter().ok(false, "JS Test", "Error decoding data " + ex);
- return false;
- }
-
- if (eventData.has("result")) {
- getAsserter().ok(eventData.optBoolean("result"), "JS Test", eventData.optString("msg"));
- }
-
- EventDispatcher.sendResponse(eventData, new JSONObject());
- return eventData.optBoolean("done", false);
- }
-}
diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index 69e2a567f1f4..5e25bd97f85f 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -2932,8 +2932,8 @@ UpdateService.prototype = {
// with the new version of the application.
for (var i = 0; i < this._incompatibleAddons.length; ++i) {
if (this._incompatibleAddons[i].id == addon.id) {
- LOG("UpdateService:onAddonUpdateEnded - found update for add-on ID: " +
- addon.id);
+ LOG("UpdateService:onCompatibilityUpdateAvailable - found update for " +
+ "add-on ID: " + addon.id);
this._incompatibleAddons.splice(i, 1);
}
}
@@ -3184,7 +3184,6 @@ UpdateService.prototype = {
_xpcom_factory: UpdateServiceFactory,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIApplicationUpdateService,
Ci.nsIUpdateCheckListener,
- Ci.nsIAddonUpdateCheckListener,
Ci.nsITimerCallback,
Ci.nsIObserver])
};