From acde75333f4e6cb0514a0f074867b28e676e73ec Mon Sep 17 00:00:00 2001
From: viv1fi <viv1fi@gmx.com>
Date: Thu, 16 Oct 2014 15:35:54 +0200
Subject: [PATCH 01/46] Bug 1051847 - Add trusted identity block to
 about:license and about:rights. r=dao

---
 browser/base/content/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9cb11d6da61e..e5a2d47c94a2 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6503,7 +6503,7 @@ var gIdentityHandler = {
 
     // Chrome URIs however get special treatment. Some chrome URIs are
     // whitelisted to provide a positive security signal to the user.
-    let whitelist = /^about:(accounts|addons|app-manager|config|crashes|customizing|healthreport|home|newaddon|permissions|preferences|privatebrowsing|sessionrestore|support|welcomeback)/i;
+    let whitelist = /^about:(accounts|addons|app-manager|config|crashes|customizing|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|sessionrestore|support|welcomeback)/i;
     let isChromeUI = uri.schemeIs("about") && whitelist.test(uri.spec);
     if (isChromeUI) {
       this.setMode(this.IDENTITY_MODE_CHROMEUI);

From 9f7ccb1ac9f86c3853534586e2da32c6374c79e2 Mon Sep 17 00:00:00 2001
From: Kapil Singh <kpsingh201091@gmail.com>
Date: Thu, 16 Oct 2014 15:43:39 +0200
Subject: [PATCH 02/46] Bug 1079719 - Replace "greyscale" SVG filter with
 filter: grayscale(1). r=dao

---
 toolkit/themes/linux/mozapps/extensions/extensions.css |  2 +-
 .../themes/linux/mozapps/extensions/selectAddons.css   |  2 +-
 toolkit/themes/osx/mozapps/extensions/extensions.css   |  2 +-
 toolkit/themes/osx/mozapps/extensions/extensions.svg   | 10 ----------
 toolkit/themes/osx/mozapps/extensions/selectAddons.css |  2 +-
 toolkit/themes/osx/mozapps/jar.mn                      |  1 -
 .../themes/windows/mozapps/extensions/extensions.css   |  2 +-
 .../themes/windows/mozapps/extensions/extensions.svg   | 10 ----------
 .../themes/windows/mozapps/extensions/selectAddons.css |  2 +-
 toolkit/themes/windows/mozapps/jar.mn                  |  2 --
 10 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 toolkit/themes/osx/mozapps/extensions/extensions.svg
 delete mode 100644 toolkit/themes/windows/mozapps/extensions/extensions.svg

diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/extensions/extensions.css
index cf5f6baf006c..5c642fbbf1ae 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/extensions/extensions.css
@@ -401,7 +401,7 @@
 }
 
 .addon[active="false"] .icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 .addon-view[type="theme"] .icon {
diff --git a/toolkit/themes/linux/mozapps/extensions/selectAddons.css b/toolkit/themes/linux/mozapps/extensions/selectAddons.css
index d50f9d2efd90..8a94a6c1857d 100644
--- a/toolkit/themes/linux/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/linux/mozapps/extensions/selectAddons.css
@@ -146,7 +146,7 @@
 .addon:not([active]) .addon-icon,
 #disable-list .addon-icon,
 #incompatible-list .addon-icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 #footer {
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/extensions/extensions.css
index 89b18303cca5..c82c80fc1b71 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/extensions/extensions.css
@@ -466,7 +466,7 @@
 }
 
 .addon[active="false"] .icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 .addon-view[type="theme"] .icon {
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.svg b/toolkit/themes/osx/mozapps/extensions/extensions.svg
deleted file mode 100644
index 076c210469ae..000000000000
--- a/toolkit/themes/osx/mozapps/extensions/extensions.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg">
-  <filter id="greyscale">
-    <feColorMatrix type="saturate" values="0"/>
-  </filter>
-</svg>
diff --git a/toolkit/themes/osx/mozapps/extensions/selectAddons.css b/toolkit/themes/osx/mozapps/extensions/selectAddons.css
index b5c691737bac..726d2b0806af 100644
--- a/toolkit/themes/osx/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/osx/mozapps/extensions/selectAddons.css
@@ -145,7 +145,7 @@
 .addon:not([active]) .addon-icon,
 #disable-list .addon-icon,
 #incompatible-list .addon-icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 #footer {
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index f63d1b189cfb..fb36da915bee 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -47,7 +47,6 @@ toolkit.jar:
   skin/classic/mozapps/extensions/search.png                      (extensions/search.png)
   skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
 * skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
-  skin/classic/mozapps/extensions/extensions.svg                  (extensions/extensions.svg)
 * skin/classic/mozapps/extensions/selectAddons.css                (extensions/selectAddons.css)
   skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
   skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css
index d43df7966ca5..82bf21c1eff2 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -473,7 +473,7 @@
 }
 
 .addon[active="false"] .icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.svg b/toolkit/themes/windows/mozapps/extensions/extensions.svg
deleted file mode 100644
index 076c210469ae..000000000000
--- a/toolkit/themes/windows/mozapps/extensions/extensions.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg">
-  <filter id="greyscale">
-    <feColorMatrix type="saturate" values="0"/>
-  </filter>
-</svg>
diff --git a/toolkit/themes/windows/mozapps/extensions/selectAddons.css b/toolkit/themes/windows/mozapps/extensions/selectAddons.css
index 26e595f616a4..046ec1075139 100644
--- a/toolkit/themes/windows/mozapps/extensions/selectAddons.css
+++ b/toolkit/themes/windows/mozapps/extensions/selectAddons.css
@@ -158,7 +158,7 @@
 .addon:not([active]) .addon-icon,
 #disable-list .addon-icon,
 #incompatible-list .addon-icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 #footer {
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 6df7d57792cd..40cd0d042583 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -16,7 +16,6 @@ toolkit.jar:
 *       skin/classic/mozapps/extensions/extensions.css             (extensions/extensions.css)
 *       skin/classic/mozapps/extensions/selectAddons.css           (extensions/selectAddons.css)
         skin/classic/mozapps/extensions/update.css                 (extensions/update.css)
-        skin/classic/mozapps/extensions/extensions.svg             (extensions/extensions.svg)
         skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)
         skin/classic/mozapps/extensions/category-discover.png      (extensions/category-discover.png)
         skin/classic/mozapps/extensions/category-languages.png     (extensions/localeGeneric.png)
@@ -99,7 +98,6 @@ toolkit.jar:
 *       skin/classic/aero/mozapps/extensions/extensions.css                (extensions/extensions-aero.css)
 *       skin/classic/aero/mozapps/extensions/selectAddons.css              (extensions/selectAddons-aero.css)
         skin/classic/aero/mozapps/extensions/update.css                    (extensions/update.css)
-        skin/classic/aero/mozapps/extensions/extensions.svg                (extensions/extensions.svg)
         skin/classic/aero/mozapps/extensions/category-search.png           (extensions/category-search.png)
         skin/classic/aero/mozapps/extensions/category-discover.png         (extensions/category-discover-aero.png)
         skin/classic/aero/mozapps/extensions/category-languages.png        (extensions/localeGeneric-aero.png)

From 75d06ad770c57498fc2b44700afda116c3950d6c Mon Sep 17 00:00:00 2001
From: Simon Lindholm <simon.lindholm10@gmail.com>
Date: Wed, 1 Oct 2014 17:39:09 +0100
Subject: [PATCH 03/46] Bug 1075665 - Fix typo in font inspector. r=paul

--HG--
extra : rebase_source : f14d846e129ec461128636add62bddcacab6b6e0
---
 browser/devtools/fontinspector/font-inspector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/devtools/fontinspector/font-inspector.js b/browser/devtools/fontinspector/font-inspector.js
index 44f792e8e3a8..5d1b409e28f8 100644
--- a/browser/devtools/fontinspector/font-inspector.js
+++ b/browser/devtools/fontinspector/font-inspector.js
@@ -41,7 +41,7 @@ FontInspector.prototype = {
    */
   destroy: function FI_destroy() {
     this.chromeDoc = null;
-    this.inspector.sidebar.off("layoutview-selected", this.onNewNode);
+    this.inspector.sidebar.off("fontinspector-selected", this.onNewNode);
     this.inspector.selection.off("new-node", this.onNewNode);
     this.showAllButton.removeEventListener("click", this.showAll);
   },

From 9a575d1772332974ee2a26e1448220b5dcfbbacb Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 15 Oct 2014 18:24:34 -0400
Subject: [PATCH 04/46] bug 1054959 - Add 'Send Video To Device' to the context
 menu for sending videos from desktop to a second screen r=gavin, ui-r=madhava

---
 browser/base/content/browser-context.inc      |   5 +
 browser/base/content/browser.js               |   6 +
 browser/base/content/nsContextMenu.js         |  29 ++++
 browser/components/nsBrowserGlue.js           |  25 +++
 .../locales/en-US/chrome/browser/browser.dtd  |   2 +
 browser/modules/CastingApps.jsm               | 160 ++++++++++++++++++
 browser/modules/moz.build                     |   1 +
 .../secondscreen/SimpleServiceDiscovery.jsm   |   4 +-
 8 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 browser/modules/CastingApps.jsm

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index e8a58892b3b1..44fb0cf3ef0f 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -240,6 +240,11 @@
                 label="&emailVideoCmd.label;"
                 accesskey="&emailVideoCmd.accesskey;"
                 oncommand="gContextMenu.sendMedia();"/>
+      <menu id="context-castvideo"
+                label="&castVideoCmd.label;"
+                accesskey="&castVideoCmd.accesskey;">
+        <menupopup id="context-castvideo-popup" onpopupshowing="gContextMenu.populateCastVideoMenu(this)"/>
+      </menu>
       <menuitem id="context-sendaudio"
                 label="&emailAudioCmd.label;"
                 accesskey="&emailAudioCmd.accesskey;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e5a2d47c94a2..d613846dace8 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,6 +188,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
   "resource:///modules/UITour.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "CastingApps",
+  "resource:///modules/CastingApps.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
+  "resource://gre/modules/SimpleServiceDiscovery.jsm");
+
 let gInitialPages = [
   "about:blank",
   "about:newtab",
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index f73c2bb1cd40..25d237618ab1 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -208,9 +208,19 @@ nsContextMenu.prototype = {
     // Send media URL (but not for canvas, since it's a big data: URL)
     this.showItem("context-sendimage", this.onImage);
     this.showItem("context-sendvideo", this.onVideo);
+    this.showItem("context-castvideo", this.onVideo);
     this.showItem("context-sendaudio", this.onAudio);
     this.setItemAttr("context-sendvideo", "disabled", !this.mediaURL);
     this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL);
+    // getServicesForVideo alone would be sufficient here (it depends on
+    // SimpleServiceDiscovery.services), but SimpleServiceDiscovery is garanteed
+    // to be already loaded, since we load it on startup, and CastingApps isn't,
+    // so check SimpleServiceDiscovery.services first to avoid needing to load
+    // CastingApps.jsm if we don't need to.
+    let shouldShowCast = this.mediaURL &&
+                         SimpleServiceDiscovery.services.length > 0 &&
+                         CastingApps.getServicesForVideo(this.target).length > 0;
+    this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -1316,6 +1326,25 @@ nsContextMenu.prototype = {
     MailIntegration.sendMessage(this.mediaURL, "");
   },
 
+  castVideo: function() {
+    CastingApps.openExternal(this.target, window);
+  },
+
+  populateCastVideoMenu: function(popup) {
+    let videoEl = this.target;
+    popup.innerHTML = null;
+    let doc = popup.ownerDocument;
+    let services = CastingApps.getServicesForVideo(videoEl);
+    services.forEach(service => {
+      let item = doc.createElement("menuitem");
+      item.setAttribute("label", service.friendlyName);
+      item.addEventListener("command", event => {
+        CastingApps.sendVideoToService(videoEl, service);
+      });
+      popup.appendChild(item);
+    });
+  },
+
   playPlugin: function() {
     gPluginHandler.contextMenuCommand(this.browser, this.target, "play");
   },
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index abd2504a910e..5acb094f716e 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -99,6 +99,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
 XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
                                   "resource://gre/modules/LoginManagerParent.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
+                                  "resource://gre/modules/SimpleServiceDiscovery.jsm");
+
 #ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "SignInToWebsiteUX",
                                   "resource:///modules/SignInToWebsite.jsm");
@@ -747,8 +750,30 @@ BrowserGlue.prototype = {
     FormValidationHandler.uninit();
   },
 
+  _initServiceDiscovery: function () {
+    var rokuDevice = {
+      id: "roku:ecp",
+      target: "roku:ecp",
+      factory: function(aService) {
+        Cu.import("resource://gre/modules/RokuApp.jsm");
+        return new RokuApp(aService);
+      },
+      mirror: false,
+      types: ["video/mp4"],
+      extensions: ["mp4"]
+    };
+
+    // Register targets
+    SimpleServiceDiscovery.registerDevice(rokuDevice);
+
+    // Search for devices continuously every 120 seconds
+    SimpleServiceDiscovery.search(120 * 1000);
+  },
+
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
+    this._initServiceDiscovery();
+
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 29f515d814c0..e84a5512a5c9 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -484,6 +484,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
+<!ENTITY castVideoCmd.label           "Send Video To Device">
+<!ENTITY castVideoCmd.accesskey       "d">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
diff --git a/browser/modules/CastingApps.jsm b/browser/modules/CastingApps.jsm
new file mode 100644
index 000000000000..df974f04f606
--- /dev/null
+++ b/browser/modules/CastingApps.jsm
@@ -0,0 +1,160 @@
+// -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
+/* 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/. */
+"use strict";
+this.EXPORTED_SYMBOLS = ["CastingApps"];
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
+
+
+var CastingApps = {
+  _sendEventToVideo: function (element, data) {
+    let event = element.ownerDocument.createEvent("CustomEvent");
+    event.initCustomEvent("media-videoCasting", false, true, JSON.stringify(data));
+    element.dispatchEvent(event);
+  },
+
+  makeURI: function (url, charset, baseURI) {
+    return Services.io.newURI(url, charset, baseURI);
+  },
+
+  getVideo: function (element) {
+    if (!element) {
+      return null;
+    }
+
+    let extensions = SimpleServiceDiscovery.getSupportedExtensions();
+    let types = SimpleServiceDiscovery.getSupportedMimeTypes();
+
+    // Grab the poster attribute from the <video>
+    let posterURL = element.poster;
+
+    // First, look to see if the <video> has a src attribute
+    let sourceURL = element.src;
+
+    // If empty, try the currentSrc
+    if (!sourceURL) {
+      sourceURL = element.currentSrc;
+    }
+
+    if (sourceURL) {
+      // Use the file extension to guess the mime type
+      let sourceURI = this.makeURI(sourceURL, null, this.makeURI(element.baseURI));
+      if (this.allowableExtension(sourceURI, extensions)) {
+        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI};
+      }
+    }
+
+    // Next, look to see if there is a <source> child element that meets
+    // our needs
+    let sourceNodes = element.getElementsByTagName("source");
+    for (let sourceNode of sourceNodes) {
+      let sourceURI = this.makeURI(sourceNode.src, null, this.makeURI(sourceNode.baseURI));
+
+      // Using the type attribute is our ideal way to guess the mime type. Otherwise,
+      // fallback to using the file extension to guess the mime type
+      if (this.allowableMimeType(sourceNode.type, types) || this.allowableExtension(sourceURI, extensions)) {
+        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI, type: sourceNode.type };
+      }
+    }
+
+    return null;
+  },
+
+  sendVideoToService: function (videoElement, service) {
+    if (!service)
+      return;
+
+    let video = this.getVideo(videoElement);
+    if (!video) {
+      return;
+    }
+
+    // Make sure we have a player app for the given service
+    let app = SimpleServiceDiscovery.findAppForService(service);
+    if (!app)
+      return;
+
+    video.title = videoElement.ownerDocument.defaultView.top.document.title;
+    if (video.element) {
+      // If the video is currently playing on the device, pause it
+      if (!video.element.paused) {
+        video.element.pause();
+      }
+    }
+
+    app.stop(() => {
+      app.start(started => {
+        if (!started) {
+          Cu.reportError("CastingApps: Unable to start app");
+          return;
+        }
+
+        app.remoteMedia(remoteMedia => {
+          if (!remoteMedia) {
+            Cu.reportError("CastingApps: Failed to create remotemedia");
+            return;
+          }
+
+          this.session = {
+            service: service,
+            app: app,
+            remoteMedia: remoteMedia,
+            data: {
+              title: video.title,
+              source: video.source,
+              poster: video.poster
+            },
+            videoRef: Cu.getWeakReference(video.element)
+          };
+        }, this);
+      });
+    });
+  },
+
+  getServicesForVideo: function (videoElement) {
+    let video = this.getVideo(videoElement);
+    if (!video) {
+      return {};
+    }
+
+    let filteredServices = SimpleServiceDiscovery.services.filter(service => {
+      return this.allowableExtension(video.sourceURI, service.extensions) ||
+             this.allowableMimeType(video.type, service.types);
+    });
+
+    return filteredServices;
+  },
+
+  // RemoteMedia callback API methods
+  onRemoteMediaStart: function (remoteMedia) {
+    if (!this.session) {
+      return;
+    }
+
+    remoteMedia.load(this.session.data);
+
+    let video = this.session.videoRef.get();
+    if (video) {
+      this._sendEventToVideo(video, { active: true });
+    }
+  },
+
+  onRemoteMediaStop: function (remoteMedia) {
+  },
+
+  onRemoteMediaStatus: function (remoteMedia) {
+  },
+
+  allowableExtension: function (uri, extensions) {
+    return (uri instanceof Ci.nsIURL) && extensions.indexOf(uri.fileExtension) != -1;
+  },
+
+  allowableMimeType: function (type, types) {
+    return types.indexOf(type) != -1;
+  }
+};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 602edae252ea..06d5d7404174 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -14,6 +14,7 @@ XPCSHELL_TESTS_MANIFESTS += [
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
+    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
diff --git a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
index c06cbfaaf189..bca051562580 100644
--- a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
+++ b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
@@ -135,7 +135,9 @@ var SimpleServiceDiscovery = {
 
   _usingLAN: function() {
     let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
-    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI || network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET);
+    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI ||
+            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET ||
+            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_UNKNOWN);
   },
 
   _search: function _search() {

From f05da90fab34bbf0a22e7a956fc1a7df4cba5d1f Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Thu, 16 Oct 2014 16:35:10 +0200
Subject: [PATCH 05/46] Bug 1079941: implement LoopContacts.search to allow
 searching for contacts by query and use that to find out if a contact who's
 trying to call you is blocked. r=abr

---
 browser/components/loop/LoopContacts.jsm      | 75 ++++++++++++++++++-
 browser/components/loop/MozLoopService.jsm    | 52 ++++++++++---
 .../components/loop/content/js/contacts.js    | 17 +++--
 .../components/loop/content/js/contacts.jsx   | 17 +++--
 .../test/mochitest/browser_LoopContacts.js    | 63 ++++++++++++++--
 5 files changed, 195 insertions(+), 29 deletions(-)

diff --git a/browser/components/loop/LoopContacts.jsm b/browser/components/loop/LoopContacts.jsm
index b5537a0f5e36..9b0334d7284c 100644
--- a/browser/components/loop/LoopContacts.jsm
+++ b/browser/components/loop/LoopContacts.jsm
@@ -790,16 +790,85 @@ let LoopContactsInternal = Object.freeze({
 
   /**
    * Search through the data store for contacts that match a certain (sub-)string.
+   * NB: The current implementation is very simple, naive if you will; we fetch
+   *     _all_ the contacts via `getAll()` and iterate over all of them to find
+   *     the contacts matching the supplied query (brute-force search in
+   *     exponential time).
    *
-   * @param {String}   query    Needle to search for in our haystack of contacts
+   * @param {Object}   query    Needle to search for in our haystack of contacts
    * @param {Function} callback Function that will be invoked once the operation
    *                            finished. The first argument passed will be an
    *                            `Error` object or `null`. The second argument will
    *                            be an `Array` of contact objects, if successfull.
+   *
+   * Example:
+   *   LoopContacts.search({
+   *     q: "foo@bar.com",
+   *     field: "email" // 'email' is the default.
+   *   }, function(err, contacts) {
+   *     if (err) {
+   *       throw err;
+   *     }
+   *     console.dir(contacts);
+   *   });
    */
   search: function(query, callback) {
-    //TODO in bug 1037114.
-    callback(new Error("Not implemented yet!"));
+    if (!("q" in query) || !query.q) {
+      callback(new Error("Nothing to search for. 'q' is required."));
+      return;
+    }
+    if (!("field" in query)) {
+      query.field = "email";
+    }
+    let queryValue = query.q;
+    if (query.field == "tel") {
+      queryValue = queryValue.replace(/[\D]+/g, "");
+    }
+
+    const checkForMatch = function(fieldValue) {
+      if (typeof fieldValue == "string") {
+        if (query.field == "tel") {
+          return fieldValue.replace(/[\D]+/g, "").endsWith(queryValue);
+        }
+        return fieldValue == queryValue;
+      }
+      if (typeof fieldValue == "number" || typeof fieldValue == "boolean") {
+        return fieldValue == queryValue;
+      }
+      if ("value" in fieldValue) {
+        return checkForMatch(fieldValue.value);
+      }
+      return false;
+    };
+
+    let foundContacts = [];
+    this.getAll((err, contacts) => {
+      if (err) {
+        callback(err);
+        return;
+      }
+
+      for (let contact of contacts) {
+        let matchWith = contact[query.field];
+        if (!matchWith) {
+          continue;
+        }
+
+        // Many fields are defined as Arrays.
+        if (Array.isArray(matchWith)) {
+          for (let fieldValue of matchWith) {
+            if (checkForMatch(fieldValue)) {
+              foundContacts.push(contact);
+              break;
+            }
+          }
+        } else if (checkForMatch(matchWith)) {
+          foundContacts.push(contact);
+        }
+      }
+
+      callback(null, foundContacts);
+    });
   }
 });
 
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 1118a130c677..309946f80cbb 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -23,6 +23,8 @@ const LOOP_SESSION_TYPE = {
 // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
 const PREF_LOG_LEVEL = "loop.debug.loglevel";
 
+const EMAIL_OR_PHONE_RE = /^(:?\S+@\S+|\+\d+)$/;
+
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
@@ -56,6 +58,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "HawkClient",
 XPCOMUtils.defineLazyModuleGetter(this, "deriveHawkCredentials",
                                   "resource://services-common/hawkrequest.js");
 
+XPCOMUtils.defineLazyModuleGetter(this, "LoopContacts",
+                                  "resource:///modules/loop/LoopContacts.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "LoopStorage",
                                   "resource:///modules/loop/LoopStorage.jsm");
 
@@ -786,17 +791,46 @@ let MozLoopServiceInternal = {
    * Starts a call, saves the call data, and opens a chat window.
    *
    * @param {Object} callData The data associated with the call including an id.
-   * @param {Boolean} conversationType Whether or not the call is "incoming"
-   *                                   or "outgoing"
+   * @param {String} conversationType Whether or not the call is "incoming"
+   *                                  or "outgoing"
    */
   _startCall: function(callData, conversationType) {
-    this.callsData.inUse = true;
-    this.callsData.data = callData;
-    this.openChatWindow(
-      null,
-      // No title, let the page set that, to avoid flickering.
-      "",
-      "about:loopconversation#" + conversationType + "/" + callData.callId);
+    const openChat = () => {
+      this.callsData.inUse = true;
+      this.callsData.data = callData;
+
+      this.openChatWindow(
+        null,
+        // No title, let the page set that, to avoid flickering.
+        "",
+        "about:loopconversation#" + conversationType + "/" + callData.callId);
+    };
+
+    if (conversationType == "incoming" && ("callerId" in callData) &&
+        EMAIL_OR_PHONE_RE.test(callData.callerId)) {
+      LoopContacts.search({
+        q: callData.callerId,
+        field: callData.callerId.contains("@") ? "email" : "tel"
+      }, (err, contacts) => {
+        if (err) {
+          // Database error, helas!
+          openChat();
+          return;
+        }
+
+        for (let contact of contacts) {
+          if (contact.blocked) {
+            // Blocked! Send a busy signal back to the caller.
+            this._returnBusy(callData);
+            return;
+          }
+        }
+
+        openChat();
+      })
+    } else {
+      openChat();
+    }
   },
 
   /**
diff --git a/browser/components/loop/content/js/contacts.js b/browser/components/loop/content/js/contacts.js
index 4dba2cf07691..a2a8054a7265 100644
--- a/browser/components/loop/content/js/contacts.js
+++ b/browser/components/loop/content/js/contacts.js
@@ -86,12 +86,15 @@ loop.contacts = (function(_, mozL10n) {
       return (
         React.DOM.ul({className: cx({ "dropdown-menu": true,
                             "dropdown-menu-up": this.state.openDirUp })}, 
-          React.DOM.li({className: cx({ "dropdown-menu-item": true }), 
-              onClick: this.onItemClick, 'data-action': "video-call"}, 
+          React.DOM.li({className: cx({ "dropdown-menu-item": true,
+                              "disabled": this.props.blocked }), 
+              onClick: this.onItemClick, 
+              'data-action': "video-call"}, 
             React.DOM.i({className: "icon icon-video-call"}), 
             mozL10n.get("video_call_menu_button")
           ), 
-          React.DOM.li({className: cx({ "dropdown-menu-item": true }), 
+          React.DOM.li({className: cx({ "dropdown-menu-item": true,
+                              "disabled": this.props.blocked }), 
               onClick: this.onItemClick, 'data-action': "audio-call"}, 
             React.DOM.i({className: "icon icon-audio-call"}), 
             mozL10n.get("audio_call_menu_button")
@@ -388,10 +391,14 @@ loop.contacts = (function(_, mozL10n) {
           });
           break;
         case "video-call":
-          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
+          if (!contact.blocked) {
+            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
+          }
           break;
         case "audio-call":
-          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
+          if (!contact.blocked) {
+            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
+          }
           break;
         default:
           console.error("Unrecognized action: " + actionName);
diff --git a/browser/components/loop/content/js/contacts.jsx b/browser/components/loop/content/js/contacts.jsx
index 56dc27d995b9..ae534547761b 100644
--- a/browser/components/loop/content/js/contacts.jsx
+++ b/browser/components/loop/content/js/contacts.jsx
@@ -86,12 +86,15 @@ loop.contacts = (function(_, mozL10n) {
       return (
         <ul className={cx({ "dropdown-menu": true,
                             "dropdown-menu-up": this.state.openDirUp })}>
-          <li className={cx({ "dropdown-menu-item": true })}
-              onClick={this.onItemClick} data-action="video-call">
+          <li className={cx({ "dropdown-menu-item": true,
+                              "disabled": this.props.blocked })}
+              onClick={this.onItemClick}
+              data-action="video-call">
             <i className="icon icon-video-call" />
             {mozL10n.get("video_call_menu_button")}
           </li>
-          <li className={cx({ "dropdown-menu-item": true })}
+          <li className={cx({ "dropdown-menu-item": true,
+                              "disabled": this.props.blocked })}
               onClick={this.onItemClick} data-action="audio-call">
             <i className="icon icon-audio-call" />
             {mozL10n.get("audio_call_menu_button")}
@@ -388,10 +391,14 @@ loop.contacts = (function(_, mozL10n) {
           });
           break;
         case "video-call":
-          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
+          if (!contact.blocked) {
+            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
+          }
           break;
         case "audio-call":
-          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
+          if (!contact.blocked) {
+            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
+          }
           break;
         default:
           console.error("Unrecognized action: " + actionName);
diff --git a/browser/components/loop/test/mochitest/browser_LoopContacts.js b/browser/components/loop/test/mochitest/browser_LoopContacts.js
index 0447a3f1e3ab..06fe4a49b52c 100644
--- a/browser/components/loop/test/mochitest/browser_LoopContacts.js
+++ b/browser/components/loop/test/mochitest/browser_LoopContacts.js
@@ -16,6 +16,11 @@ const kContacts = [{
     "type": ["work"],
     "value": "ally@mail.com"
   }],
+  tel: [{
+    "pref": true,
+    "type": ["mobile"],
+    "value": "+31-6-12345678"
+  }],
   category: ["google"],
   published: 1406798311748,
   updated: 1406798311748
@@ -27,6 +32,11 @@ const kContacts = [{
     "type": ["work"],
     "value": "bob@gmail.com"
   }],
+  tel: [{
+    "pref": true,
+    "type": ["mobile"],
+    "value": "+1-214-5551234"
+  }],
   category: ["local"],
   published: 1406798311748,
   updated: 1406798311748
@@ -425,11 +435,50 @@ add_task(function* () {
   LoopStorage.switchDatabase();
   Assert.equal(LoopStorage.databaseName, "default", "The active partition should have changed");
 
-  LoopContacts.getAll(function(err, contacts) {
-    Assert.equal(err, null, "There shouldn't be an error");
-
-    for (let i = 0, l = contacts.length; i < l; ++i) {
-      compareContacts(contacts[i], kContacts[i]);
-    }
-  });
+  contacts = yield LoopContacts.promise("getAll");
+  for (let i = 0, l = contacts.length; i < l; ++i) {
+    compareContacts(contacts[i], kContacts[i]);
+  }
+});
+
+// Test searching for contacts.
+add_task(function* () {
+  yield promiseLoadContacts();
+
+  let contacts = yield LoopContacts.promise("search", {
+    q: "bob@gmail.com"
+  });
+  Assert.equal(contacts.length, 1, "There should be one contact found");
+  compareContacts(contacts[0], kContacts[1]);
+
+  // Test searching by name.
+  contacts = yield LoopContacts.promise("search", {
+    q: "Ally Avocado",
+    field: "name"
+  });
+  Assert.equal(contacts.length, 1, "There should be one contact found");
+  compareContacts(contacts[0], kContacts[0]);
+
+  // Test searching for multiple contacts.
+  contacts = yield LoopContacts.promise("search", {
+    q: "google",
+    field: "category"
+  });
+  Assert.equal(contacts.length, 2, "There should be two contacts found");
+
+  // Test searching for telephone numbers.
+  contacts = yield LoopContacts.promise("search", {
+    q: "+31612345678",
+    field: "tel"
+  });
+  Assert.equal(contacts.length, 1, "There should be one contact found");
+  compareContacts(contacts[0], kContacts[0]);
+
+  // Test searching for telephone numbers without prefixes.
+  contacts = yield LoopContacts.promise("search", {
+    q: "5551234",
+    field: "tel"
+  });
+  Assert.equal(contacts.length, 1, "There should be one contact found");
+  compareContacts(contacts[0], kContacts[1]);
 });

From 178bbc9e00a6afa4a43b63c7812426e428ab7432 Mon Sep 17 00:00:00 2001
From: Mark Capella <markcapella@twcny.rr.com>
Date: Thu, 16 Oct 2014 12:42:11 -0400
Subject: [PATCH 06/46] Bug 1077574 - Add current and total counts to
 Find-in-page, r=wesj

---
 mobile/android/base/FindInPageBar.java        |  37 +++++-
 .../resources/layout/find_in_page_content.xml |  18 ++-
 .../android/base/resources/values/colors.xml  |   4 +
 .../android/base/resources/values/dimens.xml  |   9 ++
 mobile/android/chrome/content/FindHelper.js   | 108 +++++++++++++-----
 mobile/android/chrome/content/browser.js      |   2 +-
 6 files changed, 142 insertions(+), 36 deletions(-)

diff --git a/mobile/android/base/FindInPageBar.java b/mobile/android/base/FindInPageBar.java
index 189142fa8b4c..fa1c4ce2597e 100644
--- a/mobile/android/base/FindInPageBar.java
+++ b/mobile/android/base/FindInPageBar.java
@@ -5,6 +5,8 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.util.GeckoEventListener;
+import org.mozilla.gecko.util.GeckoRequest;
+import org.mozilla.gecko.util.NativeJSObject;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import org.json.JSONObject;
@@ -19,12 +21,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnClickListener, GeckoEventListener  {
     private static final String REQUEST_ID = "FindInPageBar";
 
     private final Context mContext;
     private CustomEditText mFindText;
+    private TextView mStatusText;
     private boolean mInflated;
 
     public FindInPageBar(Context context, AttributeSet attrs) {
@@ -58,6 +62,8 @@ public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnC
             }
         });
 
+        mStatusText = (TextView) content.findViewById(R.id.find_status);
+
         mInflated = true;
         EventDispatcher.getInstance().registerGeckoThreadListener(this, "TextSelection:Data");
     }
@@ -71,6 +77,7 @@ public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnC
 
         // handleMessage() receives response message and determines initial state of softInput
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:Get", REQUEST_ID));
+        GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Opened", null));
     }
 
     public void hide() {
@@ -95,7 +102,7 @@ public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnC
 
     @Override
     public void afterTextChanged(Editable s) {
-        GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Find", s.toString()));
+        sendRequestToFinderHelper("FindInPage:Find", s.toString());
     }
 
     @Override
@@ -115,13 +122,13 @@ public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnC
         final int viewId = v.getId();
 
         if (viewId == R.id.find_prev) {
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Prev", mFindText.getText().toString()));
+            sendRequestToFinderHelper("FindInPage:Prev", mFindText.getText().toString());
             getInputMethodManager(mFindText).hideSoftInputFromWindow(mFindText.getWindowToken(), 0);
             return;
         }
 
         if (viewId == R.id.find_next) {
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FindInPage:Next", mFindText.getText().toString()));
+            sendRequestToFinderHelper("FindInPage:Next", mFindText.getText().toString());
             getInputMethodManager(mFindText).hideSoftInputFromWindow(mFindText.getWindowToken(), 0);
             return;
         }
@@ -170,4 +177,28 @@ public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnC
             });
         }
     }
+
+    /**
+     * Request find operation, and update matchCount results (current count and total).
+     */
+    private void sendRequestToFinderHelper(String request, String searchString) {
+        GeckoAppShell.sendRequestToGecko(new GeckoRequest(request, searchString) {
+            @Override
+            public void onResponse(NativeJSObject nativeJSObject) {
+                final int total = nativeJSObject.optInt("total", 0);
+                final int current = nativeJSObject.optInt("current", 0);
+
+                final Boolean statusVisibility = (total > 0);
+                final String statusText = current + "/" + total;
+
+                ThreadUtils.postToUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        mStatusText.setVisibility(statusVisibility ? View.VISIBLE : View.GONE);
+                        mStatusText.setText(statusText);
+                    }
+                });
+            }
+        });
+    }
 }
diff --git a/mobile/android/base/resources/layout/find_in_page_content.xml b/mobile/android/base/resources/layout/find_in_page_content.xml
index 3a1b52169799..2c6d01544ae5 100644
--- a/mobile/android/base/resources/layout/find_in_page_content.xml
+++ b/mobile/android/base/resources/layout/find_in_page_content.xml
@@ -6,34 +6,44 @@
               android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1.0"
-              android:layout_marginLeft="5dip"
-              android:layout_marginRight="5dip"
+              android:layout_marginLeft="@dimen/find_in_page_text_margin_left"
+              android:layout_marginRight="@dimen/find_in_page_text_margin_right"
               android:contentDescription="@string/find_text"
               android:background="@drawable/url_bar_entry"
               android:singleLine="true"
               android:textColor="#000000"
               android:textCursorDrawable="@null"
               android:inputType="text"
-              android:paddingLeft="15dip"
-              android:paddingRight="15dip"
+              android:paddingLeft="@dimen/find_in_page_text_padding_left"
+              android:paddingRight="@dimen/find_in_page_text_padding_right"
               android:textColorHighlight="@color/url_bar_text_highlight"
               android:imeOptions="actionSearch"
               android:selectAllOnFocus="true"
               android:gravity="center_vertical|left"/>
 
+    <TextView android:id="@+id/find_status"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginRight="@dimen/find_in_page_status_margin_right"
+              android:textColor="@color/find_status_default"
+              android:visibility="gone"/>
+
     <ImageButton android:id="@+id/find_prev"
                  style="@style/FindBar.ImageButton"
                  android:contentDescription="@string/find_prev"
+                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:src="@drawable/find_prev"/>
 
     <ImageButton android:id="@+id/find_next"
                  style="@style/FindBar.ImageButton"
                  android:contentDescription="@string/find_next"
+                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:src="@drawable/find_next"/>
 
     <ImageButton android:id="@+id/find_close"
                  style="@style/FindBar.ImageButton"
                  android:contentDescription="@string/find_close"
+                 android:layout_marginTop="@dimen/find_in_page_control_margin_top"
                  android:src="@drawable/find_close"/>
 
 </merge>
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index 5f3915528324..8c73b01683d9 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -137,4 +137,8 @@
   <color name="toast_button_background">#00000000</color>
   <color name="toast_button_pressed">#DD2C3136</color>
   <color name="toast_button_text">#FFFFFFFF</color>
+
+  <!-- Colour used for Find-In-Page dialog -->
+  <color name="find_status_default">#AFB1B3</color>
+
 </resources>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 873606efe036..c0ab4f1030a6 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -144,4 +144,13 @@
     <dimen name="arrow_popup_arrow_width">40dip</dimen>
     <dimen name="arrow_popup_arrow_height">12dip</dimen>
     <dimen name="arrow_popup_arrow_offset">8dp</dimen>
+
+    <!-- Find-In-Page dialog dimensions. -->
+    <dimen name="find_in_page_text_margin_left">5dip</dimen>
+    <dimen name="find_in_page_text_margin_right">12dip</dimen>
+    <dimen name="find_in_page_text_padding_left">10dip</dimen>
+    <dimen name="find_in_page_text_padding_right">10dip</dimen>
+    <dimen name="find_in_page_status_margin_right">5dip</dimen>
+    <dimen name="find_in_page_control_margin_top">2dip</dimen>
+
 </resources>
diff --git a/mobile/android/chrome/content/FindHelper.js b/mobile/android/chrome/content/FindHelper.js
index 39b10eb62951..9fb552c20671 100644
--- a/mobile/android/chrome/content/FindHelper.js
+++ b/mobile/android/chrome/content/FindHelper.js
@@ -8,35 +8,100 @@ var FindHelper = {
   _targetTab: null,
   _initialViewport: null,
   _viewportChanged: false,
+  _matchesCountResult: null,
 
   observe: function(aMessage, aTopic, aData) {
     switch(aTopic) {
-      case "FindInPage:Find":
-        this.doFind(aData);
+      case "FindInPage:Opened": {
+        this._findOpened();
+        this._init();
         break;
+      }
 
-      case "FindInPage:Prev":
-        this.findAgain(aData, true);
+      case "Tab:Selected": {
+        // Allow for page switching.
+        this._uninit();
         break;
+      }
 
-      case "FindInPage:Next":
-        this.findAgain(aData, false);
-        break;
-
-      case "Tab:Selected":
       case "FindInPage:Closed":
-        this.findClosed();
+        this._uninit();
+        this._findClosed();
         break;
     }
   },
 
+  _findOpened: function() {
+    Messaging.addListener((data) => {
+      this.doFind(data);
+      return this._getMatchesCountResult(data);
+    }, "FindInPage:Find");
+
+    Messaging.addListener((data) => {
+      this.findAgain(data, false);
+      return this._getMatchesCountResult(data);
+    }, "FindInPage:Next");
+
+    Messaging.addListener((data) => {
+      this.findAgain(data, true);
+      return this._getMatchesCountResult(data);
+    }, "FindInPage:Prev");
+  },
+
+  _init: function() {
+    // If there's no find in progress, start one.
+    if (this._finder) {
+      return;
+    }
+
+    this._targetTab = BrowserApp.selectedTab;
+    this._finder = this._targetTab.browser.finder;
+    this._finder.addResultListener(this);
+    this._initialViewport = JSON.stringify(this._targetTab.getViewport());
+    this._viewportChanged = false;
+  },
+
+  _uninit: function() {
+    // If there's no find in progress, there's nothing to clean up.
+    if (!this._finder) {
+      return;
+    }
+
+    this._finder.removeSelection();
+    this._finder.removeResultListener(this);
+    this._finder = null;
+    this._targetTab = null;
+    this._initialViewport = null;
+    this._viewportChanged = false;
+  },
+
+  _findClosed: function() {
+    Messaging.removeListener("FindInPage:Find");
+    Messaging.removeListener("FindInPage:Next");
+    Messaging.removeListener("FindInPage:Prev");
+  },
+
+  /**
+   * Request, wait for, and return the current matchesCount results for a string.
+   */
+  _getMatchesCountResult: function(findString) {
+      // Sync call to Finder, results available immediately.
+      this._matchesCountResult = null;
+      this._finder.requestMatchesCount(findString);
+
+      return this._matchesCountResult;
+  },
+
+  /**
+   * Pass along the count results to FindInPageBar for display.
+   */
+  onMatchesCountResult: function(result) {
+    this._matchesCountResult = result;
+  },
+
   doFind: function(aSearchString) {
     if (!this._finder) {
-      this._targetTab = BrowserApp.selectedTab;
-      this._finder = this._targetTab.browser.finder;
-      this._finder.addResultListener(this);
-      this._initialViewport = JSON.stringify(this._targetTab.getViewport());
-      this._viewportChanged = false;
+      this._init();
     }
 
     this._finder.fastFind(aSearchString, false);
@@ -52,19 +117,6 @@ var FindHelper = {
     this._finder.findAgain(aFindBackwards, false, false);
   },
 
-  findClosed: function() {
-    // If there's no find in progress, there's nothing to clean up
-    if (!this._finder)
-      return;
-
-    this._finder.removeSelection();
-    this._finder.removeResultListener(this);
-    this._finder = null;
-    this._targetTab = null;
-    this._initialViewport = null;
-    this._viewportChanged = false;
-  },
-
   onFindResult: function(aData) {
     if (aData.result == Ci.nsITypeAheadFind.FIND_NOTFOUND) {
       if (this._viewportChanged) {
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index c07b180f0df6..169febfc3bb1 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -127,7 +127,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "SharedPreferences",
 #endif
   ["MemoryObserver", ["memory-pressure", "Memory:Dump"], "chrome://browser/content/MemoryObserver.js"],
   ["ConsoleAPI", ["console-api-log-event"], "chrome://browser/content/ConsoleAPI.js"],
-  ["FindHelper", ["FindInPage:Find", "FindInPage:Prev", "FindInPage:Next", "FindInPage:Closed", "Tab:Selected"], "chrome://browser/content/FindHelper.js"],
+  ["FindHelper", ["FindInPage:Opened", "FindInPage:Closed", "Tab:Selected"], "chrome://browser/content/FindHelper.js"],
   ["PermissionsHelper", ["Permissions:Get", "Permissions:Clear"], "chrome://browser/content/PermissionsHelper.js"],
   ["FeedHandler", ["Feeds:Subscribe"], "chrome://browser/content/FeedHandler.js"],
   ["Feedback", ["Feedback:Show"], "chrome://browser/content/Feedback.js"],

From 86289da8b55fa2410512a007501708b33da0d534 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 16 Oct 2014 12:56:00 -0400
Subject: [PATCH 07/46] bug 1054959 - follow up to fix context menut test
 r=orange CLOSED TREE

---
 browser/base/content/test/general/test_contextmenu.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index 20c86b4534a7..cf439e87576b 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -174,7 +174,8 @@ function runTest(testNum) {
                           "---",                        null,
                           "context-savevideo",          true,
                           "context-video-saveimage",    true,
-                          "context-sendvideo",          true
+                          "context-sendvideo",          true,
+                          "context-castvideo",          true
                          ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.

From 9b7f6776df1ce8ca5e4b9be16b2c059cce12497f Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 16 Oct 2014 18:58:59 +0100
Subject: [PATCH 08/46] Bug 1048162 Part 1 - Add an 'Email Link' button to Loop
 desktop failed call view. r=Standard8

---
 browser/components/loop/MozLoopAPI.jsm        | 13 +--
 .../loop/content/js/conversationViews.js      | 90 +++++++++++++------
 .../loop/content/js/conversationViews.jsx     | 88 ++++++++++++------
 browser/components/loop/content/js/panel.js   |  7 +-
 browser/components/loop/content/js/panel.jsx  |  7 +-
 .../loop/content/shared/css/conversation.css  | 11 ++-
 .../loop/content/shared/js/actions.js         |  7 ++
 .../content/shared/js/conversationStore.js    | 20 ++++-
 .../loop/content/shared/js/utils.js           | 30 ++++++-
 .../desktop-local/conversationViews_test.js   | 57 +++++++++++-
 .../loop/test/desktop-local/panel_test.js     |  6 +-
 .../test/shared/conversationStore_test.js     | 25 +++++-
 .../components/loop/test/shared/utils_test.js | 29 +++++-
 13 files changed, 312 insertions(+), 78 deletions(-)

diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/MozLoopAPI.jsm
index aeecd605207c..77f92ff76b54 100644
--- a/browser/components/loop/MozLoopAPI.jsm
+++ b/browser/components/loop/MozLoopAPI.jsm
@@ -601,15 +601,18 @@ function injectLoopAPI(targetWindow) {
     /**
      * Composes an email via the external protocol service.
      *
-     * @param {String} subject Subject of the email to send
-     * @param {String} body    Body message of the email to send
+     * @param {String} subject   Subject of the email to send
+     * @param {String} body      Body message of the email to send
+     * @param {String} recipient Recipient email address (optional)
      */
     composeEmail: {
       enumerable: true,
       writable: true,
-      value: function(subject, body) {
-        let mailtoURL = "mailto:?subject=" + encodeURIComponent(subject) + "&" +
-                        "body=" + encodeURIComponent(body);
+      value: function(subject, body, recipient) {
+        recipient = recipient || "";
+        let mailtoURL = "mailto:" + encodeURIComponent(recipient) +
+                        "?subject=" + encodeURIComponent(subject) +
+                        "&body=" + encodeURIComponent(body);
         extProtocolSvc.loadURI(CommonUtils.makeURI(mailtoURL));
       }
     },
diff --git a/browser/components/loop/content/js/conversationViews.js b/browser/components/loop/content/js/conversationViews.js
index 758206cf44b8..bd93cd9c3135 100644
--- a/browser/components/loop/content/js/conversationViews.js
+++ b/browser/components/loop/content/js/conversationViews.js
@@ -12,8 +12,20 @@ loop.conversationViews = (function(mozL10n) {
   var CALL_STATES = loop.store.CALL_STATES;
   var CALL_TYPES = loop.shared.utils.CALL_TYPES;
   var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
   var sharedViews = loop.shared.views;
 
+  // This duplicates a similar function in contacts.jsx that isn't used in the
+  // conversation window. If we get too many of these, we might want to consider
+  // finding a logical place for them to be shared.
+  function _getPreferredEmail(contact) {
+    // A contact may not contain email addresses, but only a phone number.
+    if (!contact.email || contact.email.length === 0) {
+      return { value: "" };
+    }
+    return contact.email.find(e => e.pref) || contact.email[0];
+  }
+
   /**
    * Displays information about the call
    * Caller avatar, name & conversation creation date
@@ -93,17 +105,6 @@ loop.conversationViews = (function(mozL10n) {
       contact: React.PropTypes.object
     },
 
-    // This duplicates a similar function in contacts.jsx that isn't used in the
-    // conversation window. If we get too many of these, we might want to consider
-    // finding a logical place for them to be shared.
-    _getPreferredEmail: function(contact) {
-      // A contact may not contain email addresses, but only a phone number.
-      if (!contact.email || contact.email.length == 0) {
-        return { value: "" };
-      }
-      return contact.email.find(e => e.pref) || contact.email[0];
-    },
-
     render: function() {
       var contactName;
 
@@ -111,7 +112,7 @@ loop.conversationViews = (function(mozL10n) {
           this.props.contact.name[0]) {
         contactName = this.props.contact.name[0];
       } else {
-        contactName = this._getPreferredEmail(this.props.contact).value;
+        contactName = _getPreferredEmail(this.props.contact).value;
       }
 
       document.title = contactName;
@@ -187,8 +188,33 @@ loop.conversationViews = (function(mozL10n) {
    * Call failed view. Displayed when a call fails.
    */
   var CallFailedView = React.createClass({displayName: 'CallFailedView',
+    mixins: [Backbone.Events],
+
     propTypes: {
-      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      store: React.PropTypes.instanceOf(
+        loop.store.ConversationStore).isRequired,
+      contact: React.PropTypes.object.isRequired
+    },
+
+    getInitialState: function() {
+      return {emailLinkButtonDisabled: false};
+    },
+
+    componentDidMount: function() {
+      this.listenTo(this.props.store, "change:emailLink",
+                    this._onEmailLinkReceived);
+    },
+
+    componentWillUnmount: function() {
+      this.stopListening(this.props.store);
+    },
+
+    _onEmailLinkReceived: function() {
+      var emailLink = this.props.store.get("emailLink");
+      var contactEmail = _getPreferredEmail(this.props.contact).value;
+      sharedUtils.composeCallUrlEmail(emailLink, contactEmail);
+      window.close();
     },
 
     retryCall: function() {
@@ -199,25 +225,33 @@ loop.conversationViews = (function(mozL10n) {
       this.props.dispatcher.dispatch(new sharedActions.CancelCall());
     },
 
+    emailLink: function() {
+      this.setState({emailLinkButtonDisabled: true});
+
+      this.props.dispatcher.dispatch(new sharedActions.FetchEmailLink());
+    },
+
     render: function() {
       return (
         React.DOM.div({className: "call-window"}, 
           React.DOM.h2(null, mozL10n.get("generic_failure_title")), 
 
-          React.DOM.p({className: "btn-label"}, mozL10n.get("generic_failure_no_reason2")), 
+          React.DOM.p({className: "btn-label"}, mozL10n.get("generic_failure_with_reason2")), 
 
           React.DOM.div({className: "btn-group call-action-group"}, 
-            React.DOM.div({className: "fx-embedded-call-button-spacer"}), 
-              React.DOM.button({className: "btn btn-accept btn-retry", 
-                      onClick: this.retryCall}, 
-                mozL10n.get("retry_call_button")
-              ), 
-            React.DOM.div({className: "fx-embedded-call-button-spacer"}), 
-              React.DOM.button({className: "btn btn-cancel", 
-                      onClick: this.cancelCall}, 
-                mozL10n.get("cancel_button")
-              ), 
-            React.DOM.div({className: "fx-embedded-call-button-spacer"})
+            React.DOM.button({className: "btn btn-cancel", 
+                    onClick: this.cancelCall}, 
+              mozL10n.get("cancel_button")
+            ), 
+            React.DOM.button({className: "btn btn-info btn-retry", 
+                    onClick: this.retryCall}, 
+              mozL10n.get("retry_call_button")
+            ), 
+            React.DOM.button({className: "btn btn-info btn-email", 
+                    onClick: this.emailLink, 
+                    disabled: this.state.emailLinkButtonDisabled}, 
+              mozL10n.get("share_button2")
+            )
           )
         )
       );
@@ -425,7 +459,9 @@ loop.conversationViews = (function(mozL10n) {
         }
         case CALL_STATES.TERMINATED: {
           return (CallFailedView({
-            dispatcher: this.props.dispatcher}
+            dispatcher: this.props.dispatcher, 
+            store: this.props.store, 
+            contact: this.state.contact}
           ));
         }
         case CALL_STATES.ONGOING: {
@@ -445,7 +481,7 @@ loop.conversationViews = (function(mozL10n) {
             callState: this.state.callState, 
             contact: this.state.contact, 
             enableCancelButton: this._isCancellable()}
-          ))
+          ));
         }
       }
     },
diff --git a/browser/components/loop/content/js/conversationViews.jsx b/browser/components/loop/content/js/conversationViews.jsx
index 360888971037..1265043cf49d 100644
--- a/browser/components/loop/content/js/conversationViews.jsx
+++ b/browser/components/loop/content/js/conversationViews.jsx
@@ -12,8 +12,20 @@ loop.conversationViews = (function(mozL10n) {
   var CALL_STATES = loop.store.CALL_STATES;
   var CALL_TYPES = loop.shared.utils.CALL_TYPES;
   var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
   var sharedViews = loop.shared.views;
 
+  // This duplicates a similar function in contacts.jsx that isn't used in the
+  // conversation window. If we get too many of these, we might want to consider
+  // finding a logical place for them to be shared.
+  function _getPreferredEmail(contact) {
+    // A contact may not contain email addresses, but only a phone number.
+    if (!contact.email || contact.email.length === 0) {
+      return { value: "" };
+    }
+    return contact.email.find(e => e.pref) || contact.email[0];
+  }
+
   /**
    * Displays information about the call
    * Caller avatar, name & conversation creation date
@@ -93,17 +105,6 @@ loop.conversationViews = (function(mozL10n) {
       contact: React.PropTypes.object
     },
 
-    // This duplicates a similar function in contacts.jsx that isn't used in the
-    // conversation window. If we get too many of these, we might want to consider
-    // finding a logical place for them to be shared.
-    _getPreferredEmail: function(contact) {
-      // A contact may not contain email addresses, but only a phone number.
-      if (!contact.email || contact.email.length == 0) {
-        return { value: "" };
-      }
-      return contact.email.find(e => e.pref) || contact.email[0];
-    },
-
     render: function() {
       var contactName;
 
@@ -111,7 +112,7 @@ loop.conversationViews = (function(mozL10n) {
           this.props.contact.name[0]) {
         contactName = this.props.contact.name[0];
       } else {
-        contactName = this._getPreferredEmail(this.props.contact).value;
+        contactName = _getPreferredEmail(this.props.contact).value;
       }
 
       document.title = contactName;
@@ -187,8 +188,33 @@ loop.conversationViews = (function(mozL10n) {
    * Call failed view. Displayed when a call fails.
    */
   var CallFailedView = React.createClass({
+    mixins: [Backbone.Events],
+
     propTypes: {
-      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      store: React.PropTypes.instanceOf(
+        loop.store.ConversationStore).isRequired,
+      contact: React.PropTypes.object.isRequired
+    },
+
+    getInitialState: function() {
+      return {emailLinkButtonDisabled: false};
+    },
+
+    componentDidMount: function() {
+      this.listenTo(this.props.store, "change:emailLink",
+                    this._onEmailLinkReceived);
+    },
+
+    componentWillUnmount: function() {
+      this.stopListening(this.props.store);
+    },
+
+    _onEmailLinkReceived: function() {
+      var emailLink = this.props.store.get("emailLink");
+      var contactEmail = _getPreferredEmail(this.props.contact).value;
+      sharedUtils.composeCallUrlEmail(emailLink, contactEmail);
+      window.close();
     },
 
     retryCall: function() {
@@ -199,25 +225,33 @@ loop.conversationViews = (function(mozL10n) {
       this.props.dispatcher.dispatch(new sharedActions.CancelCall());
     },
 
+    emailLink: function() {
+      this.setState({emailLinkButtonDisabled: true});
+
+      this.props.dispatcher.dispatch(new sharedActions.FetchEmailLink());
+    },
+
     render: function() {
       return (
         <div className="call-window">
           <h2>{mozL10n.get("generic_failure_title")}</h2>
 
-          <p className="btn-label">{mozL10n.get("generic_failure_no_reason2")}</p>
+          <p className="btn-label">{mozL10n.get("generic_failure_with_reason2")}</p>
 
           <div className="btn-group call-action-group">
-            <div className="fx-embedded-call-button-spacer"></div>
-              <button className="btn btn-accept btn-retry"
-                      onClick={this.retryCall}>
-                {mozL10n.get("retry_call_button")}
-              </button>
-            <div className="fx-embedded-call-button-spacer"></div>
-              <button className="btn btn-cancel"
-                      onClick={this.cancelCall}>
-                {mozL10n.get("cancel_button")}
-              </button>
-            <div className="fx-embedded-call-button-spacer"></div>
+            <button className="btn btn-cancel"
+                    onClick={this.cancelCall}>
+              {mozL10n.get("cancel_button")}
+            </button>
+            <button className="btn btn-info btn-retry"
+                    onClick={this.retryCall}>
+              {mozL10n.get("retry_call_button")}
+            </button>
+            <button className="btn btn-info btn-email"
+                    onClick={this.emailLink}
+                    disabled={this.state.emailLinkButtonDisabled}>
+              {mozL10n.get("share_button2")}
+            </button>
           </div>
         </div>
       );
@@ -426,6 +460,8 @@ loop.conversationViews = (function(mozL10n) {
         case CALL_STATES.TERMINATED: {
           return (<CallFailedView
             dispatcher={this.props.dispatcher}
+            store={this.props.store}
+            contact={this.state.contact}
           />);
         }
         case CALL_STATES.ONGOING: {
@@ -445,7 +481,7 @@ loop.conversationViews = (function(mozL10n) {
             callState={this.state.callState}
             contact={this.state.contact}
             enableCancelButton={this._isCancellable()}
-          />)
+          />);
         }
       }
     },
diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index 31cf0ad2d8c8..64f3ed90a732 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -15,6 +15,7 @@ loop.panel = (function(_, mozL10n) {
   var sharedModels = loop.shared.models;
   var sharedMixins = loop.shared.mixins;
   var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
   var Button = sharedViews.Button;
   var ButtonGroup = sharedViews.ButtonGroup;
   var ContactsList = loop.contacts.ContactsList;
@@ -362,11 +363,7 @@ loop.panel = (function(_, mozL10n) {
     handleEmailButtonClick: function(event) {
       this.handleLinkExfiltration(event);
 
-      navigator.mozLoop.composeEmail(
-        __("share_email_subject4", { clientShortname: __("clientShortname2")}),
-        __("share_email_body4", { callUrl: this.state.callUrl,
-                                  clientShortname: __("clientShortname2"),
-                                  learnMoreUrl: navigator.mozLoop.getLoopCharPref("learnMoreUrl") }));
+      sharedUtils.composeCallUrlEmail(this.state.callUrl);
     },
 
     handleCopyButtonClick: function(event) {
diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx
index ea8d7c116c4f..5baf1ee1e4a1 100644
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -15,6 +15,7 @@ loop.panel = (function(_, mozL10n) {
   var sharedModels = loop.shared.models;
   var sharedMixins = loop.shared.mixins;
   var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
   var Button = sharedViews.Button;
   var ButtonGroup = sharedViews.ButtonGroup;
   var ContactsList = loop.contacts.ContactsList;
@@ -362,11 +363,7 @@ loop.panel = (function(_, mozL10n) {
     handleEmailButtonClick: function(event) {
       this.handleLinkExfiltration(event);
 
-      navigator.mozLoop.composeEmail(
-        __("share_email_subject4", { clientShortname: __("clientShortname2")}),
-        __("share_email_body4", { callUrl: this.state.callUrl,
-                                  clientShortname: __("clientShortname2"),
-                                  learnMoreUrl: navigator.mozLoop.getLoopCharPref("learnMoreUrl") }));
+      sharedUtils.composeCallUrlEmail(this.state.callUrl);
     },
 
     handleCopyButtonClick: function(event) {
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index a33cc20ec13c..ba316e77f006 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -240,16 +240,21 @@
   min-height: 230px;
 }
 
+.call-window > .btn-label {
+  text-align: center;
+}
+
 .call-action-group {
   display: flex;
-  padding: 2.5em 0 0 0;
+  padding: 2.5em 4px 0 4px;
   width: 100%;
-  justify-content: space-around;
 }
 
 .call-action-group > .btn {
-  margin-left: .5em;
   height: 26px;
+  border-radius: 2px;
+  margin: 0 4px;
+  min-width: 64px;
 }
 
 .call-action-group .btn-group-chevron,
diff --git a/browser/components/loop/content/shared/js/actions.js b/browser/components/loop/content/shared/js/actions.js
index 6c1665c4b66c..8ac8c765cd09 100644
--- a/browser/components/loop/content/shared/js/actions.js
+++ b/browser/components/loop/content/shared/js/actions.js
@@ -30,6 +30,13 @@ loop.shared.actions = (function() {
   };
 
   return {
+    /**
+     * Fetch a new call url from the server, intended to be sent over email when
+     * a contact can't be reached.
+     */
+    FetchEmailLink: Action.define("fetchEmailLink", {
+    }),
+
     /**
      * Used to trigger gathering of initial call data.
      */
diff --git a/browser/components/loop/content/shared/js/conversationStore.js b/browser/components/loop/content/shared/js/conversationStore.js
index 2551e74af26e..c5bbbab7256e 100644
--- a/browser/components/loop/content/shared/js/conversationStore.js
+++ b/browser/components/loop/content/shared/js/conversationStore.js
@@ -126,7 +126,8 @@ loop.store.ConversationStore = (function() {
         "cancelCall",
         "retryCall",
         "mediaConnected",
-        "setMute"
+        "setMute",
+        "fetchEmailLink"
       ]);
     },
 
@@ -303,6 +304,23 @@ loop.store.ConversationStore = (function() {
       this.set(muteType, !actionData.enabled);
     },
 
+    /**
+     * Fetches a new call URL intended to be sent over email when a contact
+     * can't be reached.
+     */
+    fetchEmailLink: function() {
+      // XXX This is an empty string as a conversation identifier. Bug 1015938 implements
+      // a user-set string.
+      this.client.requestCallUrl("", function(err, callUrlData) {
+        if (err) {
+          // XXX better error reporting in the UI
+          console.error(err);
+          return;
+        }
+        this.set("emailLink", callUrlData.callUrl);
+      }.bind(this));
+    },
+
     /**
      * Obtains the outgoing call data from the server and handles the
      * result.
diff --git a/browser/components/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
index fc1d2b1f2582..d156043ed752 100644
--- a/browser/components/loop/content/shared/js/utils.js
+++ b/browser/components/loop/content/shared/js/utils.js
@@ -6,7 +6,7 @@
 
 var loop = loop || {};
 loop.shared = loop.shared || {};
-loop.shared.utils = (function() {
+loop.shared.utils = (function(mozL10n) {
   "use strict";
 
   /**
@@ -96,11 +96,37 @@ loop.shared.utils = (function() {
     }
   };
 
+  /**
+   * Generates and opens a mailto: url with call URL information prefilled.
+   * Note: This only works for Desktop.
+   *
+   * @param  {String} callUrl   The call URL.
+   * @param  {String} recipient The recipient email address (optional).
+   */
+  function composeCallUrlEmail(callUrl, recipient) {
+    if (typeof navigator.mozLoop === "undefined") {
+      console.warn("composeCallUrlEmail isn't available for Loop standalone.");
+      return;
+    }
+    navigator.mozLoop.composeEmail(
+      mozL10n.get("share_email_subject4", {
+        clientShortname: mozL10n.get("clientShortname2")
+      }),
+      mozL10n.get("share_email_body4", {
+        callUrl: callUrl,
+        clientShortname: mozL10n.get("clientShortname2"),
+        learnMoreUrl: navigator.mozLoop.getLoopCharPref("learnMoreUrl")
+      }),
+      recipient
+    );
+  }
+
   return {
     CALL_TYPES: CALL_TYPES,
     Helper: Helper,
+    composeCallUrlEmail: composeCallUrlEmail,
     formatDate: formatDate,
     getTargetPlatform: getTargetPlatform,
     getBoolPreference: getBoolPreference
   };
-})();
+})(document.mozL10n || navigator.mozL10n);
diff --git a/browser/components/loop/test/desktop-local/conversationViews_test.js b/browser/components/loop/test/desktop-local/conversationViews_test.js
index 8154b2e047c6..ffe881d61280 100644
--- a/browser/components/loop/test/desktop-local/conversationViews_test.js
+++ b/browser/components/loop/test/desktop-local/conversationViews_test.js
@@ -6,6 +6,7 @@ var expect = chai.expect;
 describe("loop.conversationViews", function () {
   "use strict";
 
+  var sharedUtils = loop.shared.utils;
   var sandbox, oldTitle, view, dispatcher, contact;
 
   var CALL_STATES = loop.store.CALL_STATES;
@@ -201,13 +202,25 @@ describe("loop.conversationViews", function () {
   });
 
   describe("CallFailedView", function() {
+    var store;
+
     function mountTestComponent(props) {
       return TestUtils.renderIntoDocument(
         loop.conversationViews.CallFailedView({
-          dispatcher: dispatcher
+          dispatcher: dispatcher,
+          store: store,
+          contact: {email: [{value: "test@test.tld"}]}
         }));
     }
 
+    beforeEach(function() {
+      store = new loop.store.ConversationStore({}, {
+        dispatcher: dispatcher,
+        client: {},
+        sdkDriver: {}
+      });
+    });
+
     it("should dispatch a retryCall action when the retry button is pressed",
       function() {
         view = mountTestComponent();
@@ -233,6 +246,48 @@ describe("loop.conversationViews", function () {
         sinon.assert.calledWithMatch(dispatcher.dispatch,
           sinon.match.hasOwn("name", "cancelCall"));
       });
+
+    it("should dispatch a fetchEmailLink action when the cancel button is pressed",
+      function() {
+        view = mountTestComponent();
+
+        var emailLinkBtn = view.getDOMNode().querySelector('.btn-email');
+
+        React.addons.TestUtils.Simulate.click(emailLinkBtn);
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithMatch(dispatcher.dispatch,
+          sinon.match.hasOwn("name", "fetchEmailLink"));
+      });
+
+    it("should disable the email link button once the action is dispatched",
+      function() {
+        view = mountTestComponent();
+        var emailLinkBtn = view.getDOMNode().querySelector('.btn-email');
+        React.addons.TestUtils.Simulate.click(emailLinkBtn);
+
+        expect(view.getDOMNode().querySelector(".btn-email").disabled).eql(true);
+      });
+
+    it("should compose an email once the email link is received", function() {
+      var composeCallUrlEmail = sandbox.stub(sharedUtils, "composeCallUrlEmail");
+      view = mountTestComponent();
+      store.set("emailLink", "http://fake.invalid/");
+
+      sinon.assert.calledOnce(composeCallUrlEmail);
+      sinon.assert.calledWithExactly(composeCallUrlEmail,
+        "http://fake.invalid/", "test@test.tld");
+    });
+
+    it("should close the conversation window once the email link is received",
+      function() {
+        sandbox.stub(window, "close");
+        view = mountTestComponent();
+
+        store.set("emailLink", "http://fake.invalid/");
+
+        sinon.assert.calledOnce(window.close);
+      });
   });
 
   describe("OngoingConversationView", function() {
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index 32a9fbe1001b..49d5c9c17866 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -8,6 +8,7 @@
 var expect = chai.expect;
 var TestUtils = React.addons.TestUtils;
 var sharedActions = loop.shared.actions;
+var sharedUtils = loop.shared.utils;
 
 describe("loop.panel", function() {
   "use strict";
@@ -449,6 +450,7 @@ describe("loop.panel", function() {
 
       it("should display a share button for email", function() {
         fakeClient.requestCallUrl = sandbox.stub();
+        var composeCallUrlEmail = sandbox.stub(sharedUtils, "composeCallUrlEmail");
         var view = TestUtils.renderIntoDocument(loop.panel.CallUrlResult({
           notifications: notifications,
           client: fakeClient
@@ -457,7 +459,9 @@ describe("loop.panel", function() {
 
         TestUtils.findRenderedDOMComponentWithClass(view, "button-email");
         TestUtils.Simulate.click(view.getDOMNode().querySelector(".button-email"));
-        sinon.assert.calledOnce(navigator.mozLoop.composeEmail);
+
+        sinon.assert.calledOnce(composeCallUrlEmail);
+        sinon.assert.calledWithExactly(composeCallUrlEmail, "http://example.com");
       });
 
       it("should feature a copy button capable of copying the call url when clicked", function() {
diff --git a/browser/components/loop/test/shared/conversationStore_test.js b/browser/components/loop/test/shared/conversationStore_test.js
index 9ff454aee01f..a0fdbcb01ba5 100644
--- a/browser/components/loop/test/shared/conversationStore_test.js
+++ b/browser/components/loop/test/shared/conversationStore_test.js
@@ -38,7 +38,8 @@ describe("loop.store.ConversationStore", function () {
 
     dispatcher = new loop.Dispatcher();
     client = {
-      setupOutgoingCall: sinon.stub()
+      setupOutgoingCall: sinon.stub(),
+      requestCallUrl: sinon.stub()
     };
     sdkDriver = {
       connectSession: sinon.stub(),
@@ -566,6 +567,28 @@ describe("loop.store.ConversationStore", function () {
     });
   });
 
+  describe("#fetchEmailLink", function() {
+    it("should request a new call url to the server", function() {
+      dispatcher.dispatch(new sharedActions.FetchEmailLink());
+
+      sinon.assert.calledOnce(client.requestCallUrl);
+      sinon.assert.calledWith(client.requestCallUrl, "");
+    });
+
+    it("should update the emailLink attribute when the new call url is received",
+      function() {
+        client.requestCallUrl = function(callId, cb) {
+          cb(null, {callUrl: "http://fake.invalid/"});
+        };
+        dispatcher.dispatch(new sharedActions.FetchEmailLink());
+
+        expect(store.get("emailLink")).eql("http://fake.invalid/");
+      });
+
+    // XXX bug 1048162 Part 2
+    it.skip("should trigger an error in case of failure");
+  });
+
   describe("Events", function() {
     describe("Websocket progress", function() {
       beforeEach(function() {
diff --git a/browser/components/loop/test/shared/utils_test.js b/browser/components/loop/test/shared/utils_test.js
index c46674fca14d..2b23a9c29e8c 100644
--- a/browser/components/loop/test/shared/utils_test.js
+++ b/browser/components/loop/test/shared/utils_test.js
@@ -18,6 +18,7 @@ describe("loop.shared.utils", function() {
   });
 
   afterEach(function() {
+    navigator.mozLoop = undefined;
     sandbox.restore();
   });
 
@@ -110,7 +111,6 @@ describe("loop.shared.utils", function() {
 
   describe("#getBoolPreference", function() {
     afterEach(function() {
-      navigator.mozLoop = undefined;
       localStorage.removeItem("test.true");
     });
 
@@ -142,4 +142,31 @@ describe("loop.shared.utils", function() {
       });
     });
   });
+
+  describe("#composeCallUrlEmail", function() {
+    var composeEmail;
+
+    beforeEach(function() {
+      // fake mozL10n
+      sandbox.stub(navigator.mozL10n, "get", function(id) {
+        switch(id) {
+          case "share_email_subject4": return "subject";
+          case "share_email_body4":    return "body";
+        }
+      });
+      composeEmail = sandbox.spy();
+      navigator.mozLoop = {
+        getLoopCharPref: sandbox.spy(),
+        composeEmail: composeEmail
+      };
+    });
+
+    it("should compose a call url email", function() {
+      sharedUtils.composeCallUrlEmail("http://invalid", "fake@invalid.tld");
+
+      sinon.assert.calledOnce(composeEmail);
+      sinon.assert.calledWith(composeEmail,
+                              "subject", "body", "fake@invalid.tld");
+    });
+  });
 });

From 31882135a26febae2f758009622f6ef58e743986 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 16 Oct 2014 18:58:59 +0100
Subject: [PATCH 09/46] Bug 1081154 - Loop direct calls should attempt to call
 phone numbers as well as email addresses. r=mikedeboer

---
 .../content/shared/js/conversationStore.js    | 21 +++++-
 .../test/shared/conversationStore_test.js     | 73 +++++++++++++++++++
 2 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/browser/components/loop/content/shared/js/conversationStore.js b/browser/components/loop/content/shared/js/conversationStore.js
index c5bbbab7256e..e328e484c4ff 100644
--- a/browser/components/loop/content/shared/js/conversationStore.js
+++ b/browser/components/loop/content/shared/js/conversationStore.js
@@ -327,10 +327,25 @@ loop.store.ConversationStore = (function() {
      */
     _setupOutgoingCall: function() {
       var contactAddresses = [];
+      var contact = this.get("contact");
 
-      this.get("contact").email.forEach(function(address) {
-        contactAddresses.push(address.value);
-      });
+      function appendContactValues(property, strip) {
+        if (contact.hasOwnProperty(property)) {
+          contact[property].forEach(function(item) {
+            if (strip) {
+              contactAddresses.push(item.value
+                .replace(/^(\+)?(.*)$/g, function(m, prefix, number) {
+                  return (prefix || "") + number.replace(/[\D]+/g, "");
+                }));
+            } else {
+              contactAddresses.push(item.value);
+            }
+          });
+        }
+      }
+
+      appendContactValues("email");
+      appendContactValues("tel", true);
 
       this.client.setupOutgoingCall(contactAddresses,
         this.get("callType"),
diff --git a/browser/components/loop/test/shared/conversationStore_test.js b/browser/components/loop/test/shared/conversationStore_test.js
index a0fdbcb01ba5..75d944cb67e8 100644
--- a/browser/components/loop/test/shared/conversationStore_test.js
+++ b/browser/components/loop/test/shared/conversationStore_test.js
@@ -276,6 +276,79 @@ describe("loop.store.ConversationStore", function () {
           ["fakeEmail"], sharedUtils.CALL_TYPES.AUDIO_VIDEO);
       });
 
+      it("should include all email addresses in the call data", function() {
+        contact = {
+          name: [ "Mr Smith" ],
+          email: [{
+            type: "home",
+            value: "fakeEmail",
+            pref: true
+          },
+          {
+            type: "work",
+            value: "emailFake",
+            pref: false
+          }]
+        };
+
+        dispatcher.dispatch(
+          new sharedActions.GatherCallData(outgoingCallData));
+
+        sinon.assert.calledOnce(client.setupOutgoingCall);
+        sinon.assert.calledWith(client.setupOutgoingCall,
+          ["fakeEmail", "emailFake"], sharedUtils.CALL_TYPES.AUDIO_VIDEO);
+      });
+
+      it("should include trim phone numbers for the call data", function() {
+        contact = {
+          name: [ "Mr Smith" ],
+          tel: [{
+            type: "home",
+            value: "+44-5667+345 496(2335)45+ 456+",
+            pref: true
+          }]
+        };
+
+        dispatcher.dispatch(
+          new sharedActions.GatherCallData(outgoingCallData));
+
+        sinon.assert.calledOnce(client.setupOutgoingCall);
+        sinon.assert.calledWith(client.setupOutgoingCall,
+          ["+445667345496233545456"], sharedUtils.CALL_TYPES.AUDIO_VIDEO);
+      });
+
+      it("should include all email and telephone values in the call data", function() {
+        contact = {
+          name: [ "Mr Smith" ],
+          email: [{
+            type: "home",
+            value: "fakeEmail",
+            pref: true
+          }, {
+            type: "work",
+            value: "emailFake",
+            pref: false
+          }],
+          tel: [{
+            type: "work",
+            value: "01234567890",
+            pref: false
+          }, {
+            type: "home",
+            value: "09876543210",
+            pref: false
+          }]
+        };
+
+        dispatcher.dispatch(
+          new sharedActions.GatherCallData(outgoingCallData));
+
+        sinon.assert.calledOnce(client.setupOutgoingCall);
+        sinon.assert.calledWith(client.setupOutgoingCall,
+          ["fakeEmail", "emailFake", "01234567890", "09876543210"],
+          sharedUtils.CALL_TYPES.AUDIO_VIDEO);
+      });
+
       describe("server response handling", function() {
         beforeEach(function() {
           sandbox.stub(dispatcher, "dispatch");

From e2129c9d11d6aeb5eb62cb85b57b6b749f706861 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 16 Oct 2014 10:00:07 -0700
Subject: [PATCH 10/46] Bug 1080055: When recreating a browser restore the
 isAppTab attribute on the docshell. r=mconley

---
 browser/base/content/tabbrowser.xml           |  14 +-
 browser/base/content/test/general/browser.ini |   1 +
 .../test/general/browser_restore_isAppTab.js  | 150 ++++++++++++++++++
 browser/base/content/test/general/head.js     |   6 +-
 4 files changed, 166 insertions(+), 5 deletions(-)
 create mode 100644 browser/base/content/test/general/browser_restore_isAppTab.js

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 014b8a1762f8..4b8dc96b0f6e 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1481,10 +1481,12 @@
             // Restore the progress listener.
             aBrowser.webProgress.addProgressListener(filter, Ci.nsIWebProgress.NOTIFY_ALL);
 
-            if (aShouldBeRemote)
+            if (aShouldBeRemote) {
               tab.setAttribute("remote", "true");
-            else
+            } else {
               tab.removeAttribute("remote");
+              aBrowser.messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: tab.pinned })
+            }
 
             if (wasActive)
               aBrowser.focus();
@@ -3095,6 +3097,13 @@
               window.focus();
               break;
             }
+            case "Browser:Init": {
+              let tab = this.getTabForBrowser(browser);
+              if (!tab)
+                return;
+              browser.messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: tab.pinned })
+              break;
+            }
           }
         ]]></body>
       </method>
@@ -3152,6 +3161,7 @@
             messageManager.addMessageListener("DOMTitleChanged", this);
             messageManager.addMessageListener("DOMWindowClose", this);
             messageManager.addMessageListener("contextmenu", this);
+            messageManager.addMessageListener("Browser:Init", this);
 
             // If this window has remote tabs, switch to our tabpanels fork
             // which does asynchronous tab switching.
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 6b4a29aa85f2..68a09499511f 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -388,6 +388,7 @@ skip-if = buildapp == 'mulet'
 [browser_removeTabsToTheEnd.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
 skip-if = e10s
+[browser_restore_isAppTab.js]
 [browser_sanitize-download-history.js]
 skip-if = true # bug 432425
 [browser_sanitize-passwordDisabledHosts.js]
diff --git a/browser/base/content/test/general/browser_restore_isAppTab.js b/browser/base/content/test/general/browser_restore_isAppTab.js
new file mode 100644
index 000000000000..b0c58206315d
--- /dev/null
+++ b/browser/base/content/test/general/browser_restore_isAppTab.js
@@ -0,0 +1,150 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const DUMMY = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
+
+function getMinidumpDirectory() {
+  let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
+  dir.append("minidumps");
+  return dir;
+}
+
+// This observer is needed so we can clean up all evidence of the crash so
+// the testrunner thinks things are peachy.
+let CrashObserver = {
+  observe: function(subject, topic, data) {
+    is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
+    ok(subject instanceof Ci.nsIPropertyBag2,
+       'Subject implements nsIPropertyBag2.');
+    // we might see this called as the process terminates due to previous tests.
+    // We are only looking for "abnormal" exits...
+    if (!subject.hasKey("abnormal")) {
+      info("This is a normal termination and isn't the one we are looking for...");
+      return;
+    }
+
+    let dumpID;
+    if ('nsICrashReporter' in Ci) {
+      dumpID = subject.getPropertyAsAString('dumpID');
+      ok(dumpID, "dumpID is present and not an empty string");
+    }
+
+    if (dumpID) {
+      let minidumpDirectory = getMinidumpDirectory();
+      let file = minidumpDirectory.clone();
+      file.append(dumpID + '.dmp');
+      file.remove(true);
+      file = minidumpDirectory.clone();
+      file.append(dumpID + '.extra');
+      file.remove(true);
+    }
+  }
+}
+Services.obs.addObserver(CrashObserver, 'ipc:content-shutdown', false);
+
+registerCleanupFunction(() => {
+  Services.obs.removeObserver(CrashObserver, 'ipc:content-shutdown');
+});
+
+function frameScript() {
+  addMessageListener("Test:GetIsAppTab", function() {
+    sendAsyncMessage("Test:IsAppTab", { isAppTab: docShell.isAppTab });
+  });
+
+  addMessageListener("Test:Crash", function() {
+    privateNoteIntentionalCrash();
+    Components.utils.import("resource://gre/modules/ctypes.jsm");
+    let zero = new ctypes.intptr_t(8);
+    let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
+    badptr.contents
+  });
+}
+
+function loadFrameScript(browser) {
+  browser.messageManager.loadFrameScript("data:,(" + frameScript.toString() + ")();", true);
+}
+
+function isBrowserAppTab(browser) {
+  return new Promise(resolve => {
+    function listener({ data }) {
+      browser.messageManager.removeMessageListener("Test:IsAppTab", listener);
+      resolve(data.isAppTab);
+    }
+    browser.messageManager.addMessageListener("Test:IsAppTab", listener);
+    browser.messageManager.sendAsyncMessage("Test:GetIsAppTab");
+  });
+}
+
+// Restarts the child process by crashing it then reloading the tab
+let restart = Task.async(function*(browser) {
+  // If the tab isn't remote this would crash the main process so skip it
+  if (!browser.isRemoteBrowser)
+    return browser;
+
+  browser.messageManager.sendAsyncMessage("Test:Crash");
+  yield promiseWaitForEvent(browser, "AboutTabCrashedLoad", false, true);
+
+  TabCrashReporter.reloadCrashedTab(browser);
+
+  yield promiseTabLoaded(gBrowser.getTabForBrowser(browser));
+});
+
+add_task(function* navigate() {
+  let tab = gBrowser.addTab("about:robots");
+  let browser = tab.linkedBrowser;
+  gBrowser.selectedTab = tab;
+  yield waitForDocLoadComplete();
+  loadFrameScript(browser);
+  let isAppTab = yield isBrowserAppTab(browser);
+  ok(!isAppTab, "Docshell shouldn't think it is an app tab");
+
+  gBrowser.pinTab(tab);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(isAppTab, "Docshell should think it is an app tab");
+
+  gBrowser.loadURI(DUMMY);
+  yield waitForDocLoadComplete();
+  loadFrameScript(browser);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(isAppTab, "Docshell should think it is an app tab");
+
+  gBrowser.unpinTab(tab);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(!isAppTab, "Docshell shouldn't think it is an app tab");
+
+  gBrowser.pinTab(tab);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(isAppTab, "Docshell should think it is an app tab");
+
+  gBrowser.loadURI("about:robots");
+  yield waitForDocLoadComplete();
+  loadFrameScript(browser);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(isAppTab, "Docshell should think it is an app tab");
+
+  gBrowser.removeCurrentTab();
+});
+
+add_task(function* crash() {
+  if (!gMultiProcessBrowser)
+    return;
+
+  let tab = gBrowser.addTab(DUMMY);
+  let browser = tab.linkedBrowser;
+  gBrowser.selectedTab = tab;
+  yield waitForDocLoadComplete();
+  loadFrameScript(browser);
+  let isAppTab = yield isBrowserAppTab(browser);
+  ok(!isAppTab, "Docshell shouldn't think it is an app tab");
+
+  gBrowser.pinTab(tab);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(isAppTab, "Docshell should think it is an app tab");
+
+  yield restart(browser);
+  loadFrameScript(browser);
+  isAppTab = yield isBrowserAppTab(browser);
+  ok(isAppTab, "Docshell should think it is an app tab");
+
+  gBrowser.removeCurrentTab();
+});
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
index c62c2d49c9c4..35865ef1b349 100644
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -108,16 +108,16 @@ function promiseWaitForCondition(aConditionFn) {
   return deferred.promise;
 }
 
-function promiseWaitForEvent(object, eventName, capturing = false) {
+function promiseWaitForEvent(object, eventName, capturing = false, chrome = false) {
   return new Promise((resolve) => {
     function listener(event) {
       info("Saw " + eventName);
-      object.removeEventListener(eventName, listener, capturing);
+      object.removeEventListener(eventName, listener, capturing, chrome);
       resolve(event);
     }
 
     info("Waiting for " + eventName);
-    object.addEventListener(eventName, listener, capturing);
+    object.addEventListener(eventName, listener, capturing, chrome);
   });
 }
 

From b8d48c69789a5b8da101f6f16bfcc7fecfae2d7c Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 16 Oct 2014 15:01:01 -0400
Subject: [PATCH 11/46] Backed out changeset b0843f9cb541 (bug 1079941) for
 mochitest-bc failures. CLOSED TREE

---
 browser/components/loop/LoopContacts.jsm      | 75 +------------------
 browser/components/loop/MozLoopService.jsm    | 52 +++----------
 .../components/loop/content/js/contacts.js    | 17 ++---
 .../components/loop/content/js/contacts.jsx   | 17 ++---
 .../test/mochitest/browser_LoopContacts.js    | 63 ++--------------
 5 files changed, 29 insertions(+), 195 deletions(-)

diff --git a/browser/components/loop/LoopContacts.jsm b/browser/components/loop/LoopContacts.jsm
index 9b0334d7284c..b5537a0f5e36 100644
--- a/browser/components/loop/LoopContacts.jsm
+++ b/browser/components/loop/LoopContacts.jsm
@@ -790,85 +790,16 @@ let LoopContactsInternal = Object.freeze({
 
   /**
    * Search through the data store for contacts that match a certain (sub-)string.
-   * NB: The current implementation is very simple, naive if you will; we fetch
-   *     _all_ the contacts via `getAll()` and iterate over all of them to find
-   *     the contacts matching the supplied query (brute-force search in
-   *     exponential time).
    *
-   * @param {Object}   query    Needle to search for in our haystack of contacts
+   * @param {String}   query    Needle to search for in our haystack of contacts
    * @param {Function} callback Function that will be invoked once the operation
    *                            finished. The first argument passed will be an
    *                            `Error` object or `null`. The second argument will
    *                            be an `Array` of contact objects, if successfull.
-   *
-   * Example:
-   *   LoopContacts.search({
-   *     q: "foo@bar.com",
-   *     field: "email" // 'email' is the default.
-   *   }, function(err, contacts) {
-   *     if (err) {
-   *       throw err;
-   *     }
-   *     console.dir(contacts);
-   *   });
    */
   search: function(query, callback) {
-    if (!("q" in query) || !query.q) {
-      callback(new Error("Nothing to search for. 'q' is required."));
-      return;
-    }
-    if (!("field" in query)) {
-      query.field = "email";
-    }
-    let queryValue = query.q;
-    if (query.field == "tel") {
-      queryValue = queryValue.replace(/[\D]+/g, "");
-    }
-
-    const checkForMatch = function(fieldValue) {
-      if (typeof fieldValue == "string") {
-        if (query.field == "tel") {
-          return fieldValue.replace(/[\D]+/g, "").endsWith(queryValue);
-        }
-        return fieldValue == queryValue;
-      }
-      if (typeof fieldValue == "number" || typeof fieldValue == "boolean") {
-        return fieldValue == queryValue;
-      }
-      if ("value" in fieldValue) {
-        return checkForMatch(fieldValue.value);
-      }
-      return false;
-    };
-
-    let foundContacts = [];
-    this.getAll((err, contacts) => {
-      if (err) {
-        callback(err);
-        return;
-      }
-
-      for (let contact of contacts) {
-        let matchWith = contact[query.field];
-        if (!matchWith) {
-          continue;
-        }
-
-        // Many fields are defined as Arrays.
-        if (Array.isArray(matchWith)) {
-          for (let fieldValue of matchWith) {
-            if (checkForMatch(fieldValue)) {
-              foundContacts.push(contact);
-              break;
-            }
-          }
-        } else if (checkForMatch(matchWith)) {
-          foundContacts.push(contact);
-        }
-      }
-
-      callback(null, foundContacts);
-    });
+    //TODO in bug 1037114.
+    callback(new Error("Not implemented yet!"));
   }
 });
 
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm
index 309946f80cbb..1118a130c677 100644
--- a/browser/components/loop/MozLoopService.jsm
+++ b/browser/components/loop/MozLoopService.jsm
@@ -23,8 +23,6 @@ const LOOP_SESSION_TYPE = {
 // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
 const PREF_LOG_LEVEL = "loop.debug.loglevel";
 
-const EMAIL_OR_PHONE_RE = /^(:?\S+@\S+|\+\d+)$/;
-
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
@@ -58,9 +56,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "HawkClient",
 XPCOMUtils.defineLazyModuleGetter(this, "deriveHawkCredentials",
                                   "resource://services-common/hawkrequest.js");
 
-XPCOMUtils.defineLazyModuleGetter(this, "LoopContacts",
-                                  "resource:///modules/loop/LoopContacts.jsm");
-
 XPCOMUtils.defineLazyModuleGetter(this, "LoopStorage",
                                   "resource:///modules/loop/LoopStorage.jsm");
 
@@ -791,46 +786,17 @@ let MozLoopServiceInternal = {
    * Starts a call, saves the call data, and opens a chat window.
    *
    * @param {Object} callData The data associated with the call including an id.
-   * @param {String} conversationType Whether or not the call is "incoming"
-   *                                  or "outgoing"
+   * @param {Boolean} conversationType Whether or not the call is "incoming"
+   *                                   or "outgoing"
    */
   _startCall: function(callData, conversationType) {
-    const openChat = () => {
-      this.callsData.inUse = true;
-      this.callsData.data = callData;
-
-      this.openChatWindow(
-        null,
-        // No title, let the page set that, to avoid flickering.
-        "",
-        "about:loopconversation#" + conversationType + "/" + callData.callId);
-    };
-
-    if (conversationType == "incoming" && ("callerId" in callData) &&
-        EMAIL_OR_PHONE_RE.test(callData.callerId)) {
-      LoopContacts.search({
-        q: callData.callerId,
-        field: callData.callerId.contains("@") ? "email" : "tel"
-      }, (err, contacts) => {
-        if (err) {
-          // Database error, helas!
-          openChat();
-          return;
-        }
-
-        for (let contact of contacts) {
-          if (contact.blocked) {
-            // Blocked! Send a busy signal back to the caller.
-            this._returnBusy(callData);
-            return;
-          }
-        }
-
-        openChat();
-      })
-    } else {
-      openChat();
-    }
+    this.callsData.inUse = true;
+    this.callsData.data = callData;
+    this.openChatWindow(
+      null,
+      // No title, let the page set that, to avoid flickering.
+      "",
+      "about:loopconversation#" + conversationType + "/" + callData.callId);
   },
 
   /**
diff --git a/browser/components/loop/content/js/contacts.js b/browser/components/loop/content/js/contacts.js
index a2a8054a7265..4dba2cf07691 100644
--- a/browser/components/loop/content/js/contacts.js
+++ b/browser/components/loop/content/js/contacts.js
@@ -86,15 +86,12 @@ loop.contacts = (function(_, mozL10n) {
       return (
         React.DOM.ul({className: cx({ "dropdown-menu": true,
                             "dropdown-menu-up": this.state.openDirUp })}, 
-          React.DOM.li({className: cx({ "dropdown-menu-item": true,
-                              "disabled": this.props.blocked }), 
-              onClick: this.onItemClick, 
-              'data-action': "video-call"}, 
+          React.DOM.li({className: cx({ "dropdown-menu-item": true }), 
+              onClick: this.onItemClick, 'data-action': "video-call"}, 
             React.DOM.i({className: "icon icon-video-call"}), 
             mozL10n.get("video_call_menu_button")
           ), 
-          React.DOM.li({className: cx({ "dropdown-menu-item": true,
-                              "disabled": this.props.blocked }), 
+          React.DOM.li({className: cx({ "dropdown-menu-item": true }), 
               onClick: this.onItemClick, 'data-action': "audio-call"}, 
             React.DOM.i({className: "icon icon-audio-call"}), 
             mozL10n.get("audio_call_menu_button")
@@ -391,14 +388,10 @@ loop.contacts = (function(_, mozL10n) {
           });
           break;
         case "video-call":
-          if (!contact.blocked) {
-            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
-          }
+          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
           break;
         case "audio-call":
-          if (!contact.blocked) {
-            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
-          }
+          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
           break;
         default:
           console.error("Unrecognized action: " + actionName);
diff --git a/browser/components/loop/content/js/contacts.jsx b/browser/components/loop/content/js/contacts.jsx
index ae534547761b..56dc27d995b9 100644
--- a/browser/components/loop/content/js/contacts.jsx
+++ b/browser/components/loop/content/js/contacts.jsx
@@ -86,15 +86,12 @@ loop.contacts = (function(_, mozL10n) {
       return (
         <ul className={cx({ "dropdown-menu": true,
                             "dropdown-menu-up": this.state.openDirUp })}>
-          <li className={cx({ "dropdown-menu-item": true,
-                              "disabled": this.props.blocked })}
-              onClick={this.onItemClick}
-              data-action="video-call">
+          <li className={cx({ "dropdown-menu-item": true })}
+              onClick={this.onItemClick} data-action="video-call">
             <i className="icon icon-video-call" />
             {mozL10n.get("video_call_menu_button")}
           </li>
-          <li className={cx({ "dropdown-menu-item": true,
-                              "disabled": this.props.blocked })}
+          <li className={cx({ "dropdown-menu-item": true })}
               onClick={this.onItemClick} data-action="audio-call">
             <i className="icon icon-audio-call" />
             {mozL10n.get("audio_call_menu_button")}
@@ -391,14 +388,10 @@ loop.contacts = (function(_, mozL10n) {
           });
           break;
         case "video-call":
-          if (!contact.blocked) {
-            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
-          }
+          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_VIDEO);
           break;
         case "audio-call":
-          if (!contact.blocked) {
-            navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
-          }
+          navigator.mozLoop.startDirectCall(contact, CALL_TYPES.AUDIO_ONLY);
           break;
         default:
           console.error("Unrecognized action: " + actionName);
diff --git a/browser/components/loop/test/mochitest/browser_LoopContacts.js b/browser/components/loop/test/mochitest/browser_LoopContacts.js
index 06fe4a49b52c..0447a3f1e3ab 100644
--- a/browser/components/loop/test/mochitest/browser_LoopContacts.js
+++ b/browser/components/loop/test/mochitest/browser_LoopContacts.js
@@ -16,11 +16,6 @@ const kContacts = [{
     "type": ["work"],
     "value": "ally@mail.com"
   }],
-  tel: [{
-    "pref": true,
-    "type": ["mobile"],
-    "value": "+31-6-12345678"
-  }],
   category: ["google"],
   published: 1406798311748,
   updated: 1406798311748
@@ -32,11 +27,6 @@ const kContacts = [{
     "type": ["work"],
     "value": "bob@gmail.com"
   }],
-  tel: [{
-    "pref": true,
-    "type": ["mobile"],
-    "value": "+1-214-5551234"
-  }],
   category: ["local"],
   published: 1406798311748,
   updated: 1406798311748
@@ -435,50 +425,11 @@ add_task(function* () {
   LoopStorage.switchDatabase();
   Assert.equal(LoopStorage.databaseName, "default", "The active partition should have changed");
 
-  contacts = yield LoopContacts.promise("getAll");
-  for (let i = 0, l = contacts.length; i < l; ++i) {
-    compareContacts(contacts[i], kContacts[i]);
-  }
-});
-
-// Test searching for contacts.
-add_task(function* () {
-  yield promiseLoadContacts();
-
-  let contacts = yield LoopContacts.promise("search", {
-    q: "bob@gmail.com"
-  });
-  Assert.equal(contacts.length, 1, "There should be one contact found");
-  compareContacts(contacts[0], kContacts[1]);
-
-  // Test searching by name.
-  contacts = yield LoopContacts.promise("search", {
-    q: "Ally Avocado",
-    field: "name"
-  });
-  Assert.equal(contacts.length, 1, "There should be one contact found");
-  compareContacts(contacts[0], kContacts[0]);
-
-  // Test searching for multiple contacts.
-  contacts = yield LoopContacts.promise("search", {
-    q: "google",
-    field: "category"
-  });
-  Assert.equal(contacts.length, 2, "There should be two contacts found");
-
-  // Test searching for telephone numbers.
-  contacts = yield LoopContacts.promise("search", {
-    q: "+31612345678",
-    field: "tel"
-  });
-  Assert.equal(contacts.length, 1, "There should be one contact found");
-  compareContacts(contacts[0], kContacts[0]);
-
-  // Test searching for telephone numbers without prefixes.
-  contacts = yield LoopContacts.promise("search", {
-    q: "5551234",
-    field: "tel"
-  });
-  Assert.equal(contacts.length, 1, "There should be one contact found");
-  compareContacts(contacts[0], kContacts[1]);
+  LoopContacts.getAll(function(err, contacts) {
+    Assert.equal(err, null, "There shouldn't be an error");
+
+    for (let i = 0, l = contacts.length; i < l; ++i) {
+      compareContacts(contacts[i], kContacts[i]);
+    }
+  });
 });

From 57109dded7c03e25e4c4a5a2fcc459348c20cc7c Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 16 Oct 2014 15:19:41 -0400
Subject: [PATCH 12/46] Backed out changesets 93bf386d290e and 063cdd7b00cc
 (bug 1054959) for test_contextmenu.html failures. CLOSED TREE

---
 browser/base/content/browser-context.inc      |   5 -
 browser/base/content/browser.js               |   6 -
 browser/base/content/nsContextMenu.js         |  29 ----
 .../test/general/test_contextmenu.html        |   3 +-
 browser/components/nsBrowserGlue.js           |  25 ---
 .../locales/en-US/chrome/browser/browser.dtd  |   2 -
 browser/modules/CastingApps.jsm               | 160 ------------------
 browser/modules/moz.build                     |   1 -
 .../secondscreen/SimpleServiceDiscovery.jsm   |   4 +-
 9 files changed, 2 insertions(+), 233 deletions(-)
 delete mode 100644 browser/modules/CastingApps.jsm

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 44fb0cf3ef0f..e8a58892b3b1 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -240,11 +240,6 @@
                 label="&emailVideoCmd.label;"
                 accesskey="&emailVideoCmd.accesskey;"
                 oncommand="gContextMenu.sendMedia();"/>
-      <menu id="context-castvideo"
-                label="&castVideoCmd.label;"
-                accesskey="&castVideoCmd.accesskey;">
-        <menupopup id="context-castvideo-popup" onpopupshowing="gContextMenu.populateCastVideoMenu(this)"/>
-      </menu>
       <menuitem id="context-sendaudio"
                 label="&emailAudioCmd.label;"
                 accesskey="&emailAudioCmd.accesskey;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d613846dace8..e5a2d47c94a2 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,12 +188,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
   "resource:///modules/UITour.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "CastingApps",
-  "resource:///modules/CastingApps.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
-  "resource://gre/modules/SimpleServiceDiscovery.jsm");
-
 let gInitialPages = [
   "about:blank",
   "about:newtab",
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 25d237618ab1..f73c2bb1cd40 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -208,19 +208,9 @@ nsContextMenu.prototype = {
     // Send media URL (but not for canvas, since it's a big data: URL)
     this.showItem("context-sendimage", this.onImage);
     this.showItem("context-sendvideo", this.onVideo);
-    this.showItem("context-castvideo", this.onVideo);
     this.showItem("context-sendaudio", this.onAudio);
     this.setItemAttr("context-sendvideo", "disabled", !this.mediaURL);
     this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL);
-    // getServicesForVideo alone would be sufficient here (it depends on
-    // SimpleServiceDiscovery.services), but SimpleServiceDiscovery is garanteed
-    // to be already loaded, since we load it on startup, and CastingApps isn't,
-    // so check SimpleServiceDiscovery.services first to avoid needing to load
-    // CastingApps.jsm if we don't need to.
-    let shouldShowCast = this.mediaURL &&
-                         SimpleServiceDiscovery.services.length > 0 &&
-                         CastingApps.getServicesForVideo(this.target).length > 0;
-    this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -1326,25 +1316,6 @@ nsContextMenu.prototype = {
     MailIntegration.sendMessage(this.mediaURL, "");
   },
 
-  castVideo: function() {
-    CastingApps.openExternal(this.target, window);
-  },
-
-  populateCastVideoMenu: function(popup) {
-    let videoEl = this.target;
-    popup.innerHTML = null;
-    let doc = popup.ownerDocument;
-    let services = CastingApps.getServicesForVideo(videoEl);
-    services.forEach(service => {
-      let item = doc.createElement("menuitem");
-      item.setAttribute("label", service.friendlyName);
-      item.addEventListener("command", event => {
-        CastingApps.sendVideoToService(videoEl, service);
-      });
-      popup.appendChild(item);
-    });
-  },
-
   playPlugin: function() {
     gPluginHandler.contextMenuCommand(this.browser, this.target, "play");
   },
diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index cf439e87576b..20c86b4534a7 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -174,8 +174,7 @@ function runTest(testNum) {
                           "---",                        null,
                           "context-savevideo",          true,
                           "context-video-saveimage",    true,
-                          "context-sendvideo",          true,
-                          "context-castvideo",          true
+                          "context-sendvideo",          true
                          ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 5acb094f716e..abd2504a910e 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -99,9 +99,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
 XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
                                   "resource://gre/modules/LoginManagerParent.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
-                                  "resource://gre/modules/SimpleServiceDiscovery.jsm");
-
 #ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "SignInToWebsiteUX",
                                   "resource:///modules/SignInToWebsite.jsm");
@@ -750,30 +747,8 @@ BrowserGlue.prototype = {
     FormValidationHandler.uninit();
   },
 
-  _initServiceDiscovery: function () {
-    var rokuDevice = {
-      id: "roku:ecp",
-      target: "roku:ecp",
-      factory: function(aService) {
-        Cu.import("resource://gre/modules/RokuApp.jsm");
-        return new RokuApp(aService);
-      },
-      mirror: false,
-      types: ["video/mp4"],
-      extensions: ["mp4"]
-    };
-
-    // Register targets
-    SimpleServiceDiscovery.registerDevice(rokuDevice);
-
-    // Search for devices continuously every 120 seconds
-    SimpleServiceDiscovery.search(120 * 1000);
-  },
-
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
-    this._initServiceDiscovery();
-
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index e84a5512a5c9..29f515d814c0 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -484,8 +484,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
-<!ENTITY castVideoCmd.label           "Send Video To Device">
-<!ENTITY castVideoCmd.accesskey       "d">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
diff --git a/browser/modules/CastingApps.jsm b/browser/modules/CastingApps.jsm
deleted file mode 100644
index df974f04f606..000000000000
--- a/browser/modules/CastingApps.jsm
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
-/* 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/. */
-"use strict";
-this.EXPORTED_SYMBOLS = ["CastingApps"];
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
-
-
-var CastingApps = {
-  _sendEventToVideo: function (element, data) {
-    let event = element.ownerDocument.createEvent("CustomEvent");
-    event.initCustomEvent("media-videoCasting", false, true, JSON.stringify(data));
-    element.dispatchEvent(event);
-  },
-
-  makeURI: function (url, charset, baseURI) {
-    return Services.io.newURI(url, charset, baseURI);
-  },
-
-  getVideo: function (element) {
-    if (!element) {
-      return null;
-    }
-
-    let extensions = SimpleServiceDiscovery.getSupportedExtensions();
-    let types = SimpleServiceDiscovery.getSupportedMimeTypes();
-
-    // Grab the poster attribute from the <video>
-    let posterURL = element.poster;
-
-    // First, look to see if the <video> has a src attribute
-    let sourceURL = element.src;
-
-    // If empty, try the currentSrc
-    if (!sourceURL) {
-      sourceURL = element.currentSrc;
-    }
-
-    if (sourceURL) {
-      // Use the file extension to guess the mime type
-      let sourceURI = this.makeURI(sourceURL, null, this.makeURI(element.baseURI));
-      if (this.allowableExtension(sourceURI, extensions)) {
-        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI};
-      }
-    }
-
-    // Next, look to see if there is a <source> child element that meets
-    // our needs
-    let sourceNodes = element.getElementsByTagName("source");
-    for (let sourceNode of sourceNodes) {
-      let sourceURI = this.makeURI(sourceNode.src, null, this.makeURI(sourceNode.baseURI));
-
-      // Using the type attribute is our ideal way to guess the mime type. Otherwise,
-      // fallback to using the file extension to guess the mime type
-      if (this.allowableMimeType(sourceNode.type, types) || this.allowableExtension(sourceURI, extensions)) {
-        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI, type: sourceNode.type };
-      }
-    }
-
-    return null;
-  },
-
-  sendVideoToService: function (videoElement, service) {
-    if (!service)
-      return;
-
-    let video = this.getVideo(videoElement);
-    if (!video) {
-      return;
-    }
-
-    // Make sure we have a player app for the given service
-    let app = SimpleServiceDiscovery.findAppForService(service);
-    if (!app)
-      return;
-
-    video.title = videoElement.ownerDocument.defaultView.top.document.title;
-    if (video.element) {
-      // If the video is currently playing on the device, pause it
-      if (!video.element.paused) {
-        video.element.pause();
-      }
-    }
-
-    app.stop(() => {
-      app.start(started => {
-        if (!started) {
-          Cu.reportError("CastingApps: Unable to start app");
-          return;
-        }
-
-        app.remoteMedia(remoteMedia => {
-          if (!remoteMedia) {
-            Cu.reportError("CastingApps: Failed to create remotemedia");
-            return;
-          }
-
-          this.session = {
-            service: service,
-            app: app,
-            remoteMedia: remoteMedia,
-            data: {
-              title: video.title,
-              source: video.source,
-              poster: video.poster
-            },
-            videoRef: Cu.getWeakReference(video.element)
-          };
-        }, this);
-      });
-    });
-  },
-
-  getServicesForVideo: function (videoElement) {
-    let video = this.getVideo(videoElement);
-    if (!video) {
-      return {};
-    }
-
-    let filteredServices = SimpleServiceDiscovery.services.filter(service => {
-      return this.allowableExtension(video.sourceURI, service.extensions) ||
-             this.allowableMimeType(video.type, service.types);
-    });
-
-    return filteredServices;
-  },
-
-  // RemoteMedia callback API methods
-  onRemoteMediaStart: function (remoteMedia) {
-    if (!this.session) {
-      return;
-    }
-
-    remoteMedia.load(this.session.data);
-
-    let video = this.session.videoRef.get();
-    if (video) {
-      this._sendEventToVideo(video, { active: true });
-    }
-  },
-
-  onRemoteMediaStop: function (remoteMedia) {
-  },
-
-  onRemoteMediaStatus: function (remoteMedia) {
-  },
-
-  allowableExtension: function (uri, extensions) {
-    return (uri instanceof Ci.nsIURL) && extensions.indexOf(uri.fileExtension) != -1;
-  },
-
-  allowableMimeType: function (type, types) {
-    return types.indexOf(type) != -1;
-  }
-};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 06d5d7404174..602edae252ea 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -14,7 +14,6 @@ XPCSHELL_TESTS_MANIFESTS += [
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
-    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
diff --git a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
index bca051562580..c06cbfaaf189 100644
--- a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
+++ b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
@@ -135,9 +135,7 @@ var SimpleServiceDiscovery = {
 
   _usingLAN: function() {
     let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
-    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI ||
-            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET ||
-            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_UNKNOWN);
+    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI || network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET);
   },
 
   _search: function _search() {

From 99bd5cfd9b29c70ddf9179d1d76fbaca09450d52 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 15 Oct 2014 18:24:34 -0400
Subject: [PATCH 13/46] bug 1054959 - Add 'Send Video To Device' to the context
 menu for sending videos from desktop to a second screen r=gavin, ui-r=madhava
 * * * bug 1054959 - follow up to fix context menut test r=orange CLOSED TREE

---
 browser/base/content/browser-context.inc      |   5 +
 browser/base/content/browser.js               |   6 +
 browser/base/content/nsContextMenu.js         |  29 ++++
 .../test/general/test_contextmenu.html        |   3 +-
 browser/components/nsBrowserGlue.js           |  25 +++
 .../locales/en-US/chrome/browser/browser.dtd  |   2 +
 browser/modules/CastingApps.jsm               | 160 ++++++++++++++++++
 browser/modules/moz.build                     |   1 +
 .../secondscreen/SimpleServiceDiscovery.jsm   |   4 +-
 9 files changed, 233 insertions(+), 2 deletions(-)
 create mode 100644 browser/modules/CastingApps.jsm

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index e8a58892b3b1..44fb0cf3ef0f 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -240,6 +240,11 @@
                 label="&emailVideoCmd.label;"
                 accesskey="&emailVideoCmd.accesskey;"
                 oncommand="gContextMenu.sendMedia();"/>
+      <menu id="context-castvideo"
+                label="&castVideoCmd.label;"
+                accesskey="&castVideoCmd.accesskey;">
+        <menupopup id="context-castvideo-popup" onpopupshowing="gContextMenu.populateCastVideoMenu(this)"/>
+      </menu>
       <menuitem id="context-sendaudio"
                 label="&emailAudioCmd.label;"
                 accesskey="&emailAudioCmd.accesskey;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e5a2d47c94a2..d613846dace8 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,6 +188,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
   "resource:///modules/UITour.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "CastingApps",
+  "resource:///modules/CastingApps.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
+  "resource://gre/modules/SimpleServiceDiscovery.jsm");
+
 let gInitialPages = [
   "about:blank",
   "about:newtab",
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index f73c2bb1cd40..25d237618ab1 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -208,9 +208,19 @@ nsContextMenu.prototype = {
     // Send media URL (but not for canvas, since it's a big data: URL)
     this.showItem("context-sendimage", this.onImage);
     this.showItem("context-sendvideo", this.onVideo);
+    this.showItem("context-castvideo", this.onVideo);
     this.showItem("context-sendaudio", this.onAudio);
     this.setItemAttr("context-sendvideo", "disabled", !this.mediaURL);
     this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL);
+    // getServicesForVideo alone would be sufficient here (it depends on
+    // SimpleServiceDiscovery.services), but SimpleServiceDiscovery is garanteed
+    // to be already loaded, since we load it on startup, and CastingApps isn't,
+    // so check SimpleServiceDiscovery.services first to avoid needing to load
+    // CastingApps.jsm if we don't need to.
+    let shouldShowCast = this.mediaURL &&
+                         SimpleServiceDiscovery.services.length > 0 &&
+                         CastingApps.getServicesForVideo(this.target).length > 0;
+    this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -1316,6 +1326,25 @@ nsContextMenu.prototype = {
     MailIntegration.sendMessage(this.mediaURL, "");
   },
 
+  castVideo: function() {
+    CastingApps.openExternal(this.target, window);
+  },
+
+  populateCastVideoMenu: function(popup) {
+    let videoEl = this.target;
+    popup.innerHTML = null;
+    let doc = popup.ownerDocument;
+    let services = CastingApps.getServicesForVideo(videoEl);
+    services.forEach(service => {
+      let item = doc.createElement("menuitem");
+      item.setAttribute("label", service.friendlyName);
+      item.addEventListener("command", event => {
+        CastingApps.sendVideoToService(videoEl, service);
+      });
+      popup.appendChild(item);
+    });
+  },
+
   playPlugin: function() {
     gPluginHandler.contextMenuCommand(this.browser, this.target, "play");
   },
diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index 20c86b4534a7..856494036637 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -174,7 +174,8 @@ function runTest(testNum) {
                           "---",                        null,
                           "context-savevideo",          true,
                           "context-video-saveimage",    true,
-                          "context-sendvideo",          true
+                          "context-sendvideo",          true,
+                          "context-castvideo",          false
                          ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index abd2504a910e..5acb094f716e 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -99,6 +99,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
 XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
                                   "resource://gre/modules/LoginManagerParent.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
+                                  "resource://gre/modules/SimpleServiceDiscovery.jsm");
+
 #ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "SignInToWebsiteUX",
                                   "resource:///modules/SignInToWebsite.jsm");
@@ -747,8 +750,30 @@ BrowserGlue.prototype = {
     FormValidationHandler.uninit();
   },
 
+  _initServiceDiscovery: function () {
+    var rokuDevice = {
+      id: "roku:ecp",
+      target: "roku:ecp",
+      factory: function(aService) {
+        Cu.import("resource://gre/modules/RokuApp.jsm");
+        return new RokuApp(aService);
+      },
+      mirror: false,
+      types: ["video/mp4"],
+      extensions: ["mp4"]
+    };
+
+    // Register targets
+    SimpleServiceDiscovery.registerDevice(rokuDevice);
+
+    // Search for devices continuously every 120 seconds
+    SimpleServiceDiscovery.search(120 * 1000);
+  },
+
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
+    this._initServiceDiscovery();
+
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 29f515d814c0..03d438e1923a 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -484,6 +484,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
+<!ENTITY castVideoCmd.label           "Send Video To Device">
+<!ENTITY castVideoCmd.accesskey       "c">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
diff --git a/browser/modules/CastingApps.jsm b/browser/modules/CastingApps.jsm
new file mode 100644
index 000000000000..df974f04f606
--- /dev/null
+++ b/browser/modules/CastingApps.jsm
@@ -0,0 +1,160 @@
+// -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
+/* 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/. */
+"use strict";
+this.EXPORTED_SYMBOLS = ["CastingApps"];
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
+
+
+var CastingApps = {
+  _sendEventToVideo: function (element, data) {
+    let event = element.ownerDocument.createEvent("CustomEvent");
+    event.initCustomEvent("media-videoCasting", false, true, JSON.stringify(data));
+    element.dispatchEvent(event);
+  },
+
+  makeURI: function (url, charset, baseURI) {
+    return Services.io.newURI(url, charset, baseURI);
+  },
+
+  getVideo: function (element) {
+    if (!element) {
+      return null;
+    }
+
+    let extensions = SimpleServiceDiscovery.getSupportedExtensions();
+    let types = SimpleServiceDiscovery.getSupportedMimeTypes();
+
+    // Grab the poster attribute from the <video>
+    let posterURL = element.poster;
+
+    // First, look to see if the <video> has a src attribute
+    let sourceURL = element.src;
+
+    // If empty, try the currentSrc
+    if (!sourceURL) {
+      sourceURL = element.currentSrc;
+    }
+
+    if (sourceURL) {
+      // Use the file extension to guess the mime type
+      let sourceURI = this.makeURI(sourceURL, null, this.makeURI(element.baseURI));
+      if (this.allowableExtension(sourceURI, extensions)) {
+        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI};
+      }
+    }
+
+    // Next, look to see if there is a <source> child element that meets
+    // our needs
+    let sourceNodes = element.getElementsByTagName("source");
+    for (let sourceNode of sourceNodes) {
+      let sourceURI = this.makeURI(sourceNode.src, null, this.makeURI(sourceNode.baseURI));
+
+      // Using the type attribute is our ideal way to guess the mime type. Otherwise,
+      // fallback to using the file extension to guess the mime type
+      if (this.allowableMimeType(sourceNode.type, types) || this.allowableExtension(sourceURI, extensions)) {
+        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI, type: sourceNode.type };
+      }
+    }
+
+    return null;
+  },
+
+  sendVideoToService: function (videoElement, service) {
+    if (!service)
+      return;
+
+    let video = this.getVideo(videoElement);
+    if (!video) {
+      return;
+    }
+
+    // Make sure we have a player app for the given service
+    let app = SimpleServiceDiscovery.findAppForService(service);
+    if (!app)
+      return;
+
+    video.title = videoElement.ownerDocument.defaultView.top.document.title;
+    if (video.element) {
+      // If the video is currently playing on the device, pause it
+      if (!video.element.paused) {
+        video.element.pause();
+      }
+    }
+
+    app.stop(() => {
+      app.start(started => {
+        if (!started) {
+          Cu.reportError("CastingApps: Unable to start app");
+          return;
+        }
+
+        app.remoteMedia(remoteMedia => {
+          if (!remoteMedia) {
+            Cu.reportError("CastingApps: Failed to create remotemedia");
+            return;
+          }
+
+          this.session = {
+            service: service,
+            app: app,
+            remoteMedia: remoteMedia,
+            data: {
+              title: video.title,
+              source: video.source,
+              poster: video.poster
+            },
+            videoRef: Cu.getWeakReference(video.element)
+          };
+        }, this);
+      });
+    });
+  },
+
+  getServicesForVideo: function (videoElement) {
+    let video = this.getVideo(videoElement);
+    if (!video) {
+      return {};
+    }
+
+    let filteredServices = SimpleServiceDiscovery.services.filter(service => {
+      return this.allowableExtension(video.sourceURI, service.extensions) ||
+             this.allowableMimeType(video.type, service.types);
+    });
+
+    return filteredServices;
+  },
+
+  // RemoteMedia callback API methods
+  onRemoteMediaStart: function (remoteMedia) {
+    if (!this.session) {
+      return;
+    }
+
+    remoteMedia.load(this.session.data);
+
+    let video = this.session.videoRef.get();
+    if (video) {
+      this._sendEventToVideo(video, { active: true });
+    }
+  },
+
+  onRemoteMediaStop: function (remoteMedia) {
+  },
+
+  onRemoteMediaStatus: function (remoteMedia) {
+  },
+
+  allowableExtension: function (uri, extensions) {
+    return (uri instanceof Ci.nsIURL) && extensions.indexOf(uri.fileExtension) != -1;
+  },
+
+  allowableMimeType: function (type, types) {
+    return types.indexOf(type) != -1;
+  }
+};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 602edae252ea..06d5d7404174 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -14,6 +14,7 @@ XPCSHELL_TESTS_MANIFESTS += [
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
+    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
diff --git a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
index c06cbfaaf189..bca051562580 100644
--- a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
+++ b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
@@ -135,7 +135,9 @@ var SimpleServiceDiscovery = {
 
   _usingLAN: function() {
     let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
-    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI || network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET);
+    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI ||
+            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET ||
+            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_UNKNOWN);
   },
 
   _search: function _search() {

From 7ff01ce229fdaec63bff30925e380e91128220f6 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 15 Oct 2014 18:24:34 -0400
Subject: [PATCH 14/46] bug 1054959 - Add 'Send Video To Device' to the context
 menu for sending videos from desktop to a second screen r=gavin, ui-r=madhava
 * * * bug 1054959 - follow up to fix context menut test r=orange CLOSED TREE

---
 browser/base/content/browser-context.inc      |   5 +
 browser/base/content/browser.js               |   6 +
 browser/base/content/nsContextMenu.js         |  29 ++++
 .../test/general/test_contextmenu.html        |   3 +-
 browser/components/nsBrowserGlue.js           |  25 +++
 .../locales/en-US/chrome/browser/browser.dtd  |   2 +
 browser/modules/CastingApps.jsm               | 160 ++++++++++++++++++
 browser/modules/moz.build                     |   1 +
 .../secondscreen/SimpleServiceDiscovery.jsm   |   4 +-
 9 files changed, 233 insertions(+), 2 deletions(-)
 create mode 100644 browser/modules/CastingApps.jsm

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index e8a58892b3b1..44fb0cf3ef0f 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -240,6 +240,11 @@
                 label="&emailVideoCmd.label;"
                 accesskey="&emailVideoCmd.accesskey;"
                 oncommand="gContextMenu.sendMedia();"/>
+      <menu id="context-castvideo"
+                label="&castVideoCmd.label;"
+                accesskey="&castVideoCmd.accesskey;">
+        <menupopup id="context-castvideo-popup" onpopupshowing="gContextMenu.populateCastVideoMenu(this)"/>
+      </menu>
       <menuitem id="context-sendaudio"
                 label="&emailAudioCmd.label;"
                 accesskey="&emailAudioCmd.accesskey;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e5574c86add1..d114ae9a4b5a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,6 +188,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
   "resource:///modules/UITour.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "CastingApps",
+  "resource:///modules/CastingApps.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
+  "resource://gre/modules/SimpleServiceDiscovery.jsm");
+
 let gInitialPages = [
   "about:blank",
   "about:newtab",
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index f73c2bb1cd40..25d237618ab1 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -208,9 +208,19 @@ nsContextMenu.prototype = {
     // Send media URL (but not for canvas, since it's a big data: URL)
     this.showItem("context-sendimage", this.onImage);
     this.showItem("context-sendvideo", this.onVideo);
+    this.showItem("context-castvideo", this.onVideo);
     this.showItem("context-sendaudio", this.onAudio);
     this.setItemAttr("context-sendvideo", "disabled", !this.mediaURL);
     this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL);
+    // getServicesForVideo alone would be sufficient here (it depends on
+    // SimpleServiceDiscovery.services), but SimpleServiceDiscovery is garanteed
+    // to be already loaded, since we load it on startup, and CastingApps isn't,
+    // so check SimpleServiceDiscovery.services first to avoid needing to load
+    // CastingApps.jsm if we don't need to.
+    let shouldShowCast = this.mediaURL &&
+                         SimpleServiceDiscovery.services.length > 0 &&
+                         CastingApps.getServicesForVideo(this.target).length > 0;
+    this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -1316,6 +1326,25 @@ nsContextMenu.prototype = {
     MailIntegration.sendMessage(this.mediaURL, "");
   },
 
+  castVideo: function() {
+    CastingApps.openExternal(this.target, window);
+  },
+
+  populateCastVideoMenu: function(popup) {
+    let videoEl = this.target;
+    popup.innerHTML = null;
+    let doc = popup.ownerDocument;
+    let services = CastingApps.getServicesForVideo(videoEl);
+    services.forEach(service => {
+      let item = doc.createElement("menuitem");
+      item.setAttribute("label", service.friendlyName);
+      item.addEventListener("command", event => {
+        CastingApps.sendVideoToService(videoEl, service);
+      });
+      popup.appendChild(item);
+    });
+  },
+
   playPlugin: function() {
     gPluginHandler.contextMenuCommand(this.browser, this.target, "play");
   },
diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index 20c86b4534a7..856494036637 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -174,7 +174,8 @@ function runTest(testNum) {
                           "---",                        null,
                           "context-savevideo",          true,
                           "context-video-saveimage",    true,
-                          "context-sendvideo",          true
+                          "context-sendvideo",          true,
+                          "context-castvideo",          false
                          ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index abd2504a910e..5acb094f716e 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -99,6 +99,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
 XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
                                   "resource://gre/modules/LoginManagerParent.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
+                                  "resource://gre/modules/SimpleServiceDiscovery.jsm");
+
 #ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "SignInToWebsiteUX",
                                   "resource:///modules/SignInToWebsite.jsm");
@@ -747,8 +750,30 @@ BrowserGlue.prototype = {
     FormValidationHandler.uninit();
   },
 
+  _initServiceDiscovery: function () {
+    var rokuDevice = {
+      id: "roku:ecp",
+      target: "roku:ecp",
+      factory: function(aService) {
+        Cu.import("resource://gre/modules/RokuApp.jsm");
+        return new RokuApp(aService);
+      },
+      mirror: false,
+      types: ["video/mp4"],
+      extensions: ["mp4"]
+    };
+
+    // Register targets
+    SimpleServiceDiscovery.registerDevice(rokuDevice);
+
+    // Search for devices continuously every 120 seconds
+    SimpleServiceDiscovery.search(120 * 1000);
+  },
+
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
+    this._initServiceDiscovery();
+
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 29f515d814c0..e84a5512a5c9 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -484,6 +484,8 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
+<!ENTITY castVideoCmd.label           "Send Video To Device">
+<!ENTITY castVideoCmd.accesskey       "d">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
diff --git a/browser/modules/CastingApps.jsm b/browser/modules/CastingApps.jsm
new file mode 100644
index 000000000000..df974f04f606
--- /dev/null
+++ b/browser/modules/CastingApps.jsm
@@ -0,0 +1,160 @@
+// -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
+/* 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/. */
+"use strict";
+this.EXPORTED_SYMBOLS = ["CastingApps"];
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
+
+
+var CastingApps = {
+  _sendEventToVideo: function (element, data) {
+    let event = element.ownerDocument.createEvent("CustomEvent");
+    event.initCustomEvent("media-videoCasting", false, true, JSON.stringify(data));
+    element.dispatchEvent(event);
+  },
+
+  makeURI: function (url, charset, baseURI) {
+    return Services.io.newURI(url, charset, baseURI);
+  },
+
+  getVideo: function (element) {
+    if (!element) {
+      return null;
+    }
+
+    let extensions = SimpleServiceDiscovery.getSupportedExtensions();
+    let types = SimpleServiceDiscovery.getSupportedMimeTypes();
+
+    // Grab the poster attribute from the <video>
+    let posterURL = element.poster;
+
+    // First, look to see if the <video> has a src attribute
+    let sourceURL = element.src;
+
+    // If empty, try the currentSrc
+    if (!sourceURL) {
+      sourceURL = element.currentSrc;
+    }
+
+    if (sourceURL) {
+      // Use the file extension to guess the mime type
+      let sourceURI = this.makeURI(sourceURL, null, this.makeURI(element.baseURI));
+      if (this.allowableExtension(sourceURI, extensions)) {
+        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI};
+      }
+    }
+
+    // Next, look to see if there is a <source> child element that meets
+    // our needs
+    let sourceNodes = element.getElementsByTagName("source");
+    for (let sourceNode of sourceNodes) {
+      let sourceURI = this.makeURI(sourceNode.src, null, this.makeURI(sourceNode.baseURI));
+
+      // Using the type attribute is our ideal way to guess the mime type. Otherwise,
+      // fallback to using the file extension to guess the mime type
+      if (this.allowableMimeType(sourceNode.type, types) || this.allowableExtension(sourceURI, extensions)) {
+        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI, type: sourceNode.type };
+      }
+    }
+
+    return null;
+  },
+
+  sendVideoToService: function (videoElement, service) {
+    if (!service)
+      return;
+
+    let video = this.getVideo(videoElement);
+    if (!video) {
+      return;
+    }
+
+    // Make sure we have a player app for the given service
+    let app = SimpleServiceDiscovery.findAppForService(service);
+    if (!app)
+      return;
+
+    video.title = videoElement.ownerDocument.defaultView.top.document.title;
+    if (video.element) {
+      // If the video is currently playing on the device, pause it
+      if (!video.element.paused) {
+        video.element.pause();
+      }
+    }
+
+    app.stop(() => {
+      app.start(started => {
+        if (!started) {
+          Cu.reportError("CastingApps: Unable to start app");
+          return;
+        }
+
+        app.remoteMedia(remoteMedia => {
+          if (!remoteMedia) {
+            Cu.reportError("CastingApps: Failed to create remotemedia");
+            return;
+          }
+
+          this.session = {
+            service: service,
+            app: app,
+            remoteMedia: remoteMedia,
+            data: {
+              title: video.title,
+              source: video.source,
+              poster: video.poster
+            },
+            videoRef: Cu.getWeakReference(video.element)
+          };
+        }, this);
+      });
+    });
+  },
+
+  getServicesForVideo: function (videoElement) {
+    let video = this.getVideo(videoElement);
+    if (!video) {
+      return {};
+    }
+
+    let filteredServices = SimpleServiceDiscovery.services.filter(service => {
+      return this.allowableExtension(video.sourceURI, service.extensions) ||
+             this.allowableMimeType(video.type, service.types);
+    });
+
+    return filteredServices;
+  },
+
+  // RemoteMedia callback API methods
+  onRemoteMediaStart: function (remoteMedia) {
+    if (!this.session) {
+      return;
+    }
+
+    remoteMedia.load(this.session.data);
+
+    let video = this.session.videoRef.get();
+    if (video) {
+      this._sendEventToVideo(video, { active: true });
+    }
+  },
+
+  onRemoteMediaStop: function (remoteMedia) {
+  },
+
+  onRemoteMediaStatus: function (remoteMedia) {
+  },
+
+  allowableExtension: function (uri, extensions) {
+    return (uri instanceof Ci.nsIURL) && extensions.indexOf(uri.fileExtension) != -1;
+  },
+
+  allowableMimeType: function (type, types) {
+    return types.indexOf(type) != -1;
+  }
+};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 602edae252ea..06d5d7404174 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -14,6 +14,7 @@ XPCSHELL_TESTS_MANIFESTS += [
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
+    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
diff --git a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
index c06cbfaaf189..bca051562580 100644
--- a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
+++ b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
@@ -135,7 +135,9 @@ var SimpleServiceDiscovery = {
 
   _usingLAN: function() {
     let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
-    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI || network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET);
+    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI ||
+            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET ||
+            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_UNKNOWN);
   },
 
   _search: function _search() {

From 59e0863445f831431b24cd5975aee7f5c689c0cb Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Thu, 16 Oct 2014 15:13:30 -0700
Subject: [PATCH 15/46] Backed out changeset 1828c0ae54b9 (bug 1054959) for
 mochitest-1 bustage on a CLOSED TREE

---
 browser/base/content/browser-context.inc      |   5 -
 browser/base/content/browser.js               |   6 -
 browser/base/content/nsContextMenu.js         |  29 ----
 .../test/general/test_contextmenu.html        |   3 +-
 browser/components/nsBrowserGlue.js           |  25 ---
 .../locales/en-US/chrome/browser/browser.dtd  |   2 -
 browser/modules/CastingApps.jsm               | 160 ------------------
 browser/modules/moz.build                     |   1 -
 .../secondscreen/SimpleServiceDiscovery.jsm   |   4 +-
 9 files changed, 2 insertions(+), 233 deletions(-)
 delete mode 100644 browser/modules/CastingApps.jsm

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 44fb0cf3ef0f..e8a58892b3b1 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -240,11 +240,6 @@
                 label="&emailVideoCmd.label;"
                 accesskey="&emailVideoCmd.accesskey;"
                 oncommand="gContextMenu.sendMedia();"/>
-      <menu id="context-castvideo"
-                label="&castVideoCmd.label;"
-                accesskey="&castVideoCmd.accesskey;">
-        <menupopup id="context-castvideo-popup" onpopupshowing="gContextMenu.populateCastVideoMenu(this)"/>
-      </menu>
       <menuitem id="context-sendaudio"
                 label="&emailAudioCmd.label;"
                 accesskey="&emailAudioCmd.accesskey;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d613846dace8..e5a2d47c94a2 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,12 +188,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
   "resource:///modules/UITour.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "CastingApps",
-  "resource:///modules/CastingApps.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
-  "resource://gre/modules/SimpleServiceDiscovery.jsm");
-
 let gInitialPages = [
   "about:blank",
   "about:newtab",
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 25d237618ab1..f73c2bb1cd40 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -208,19 +208,9 @@ nsContextMenu.prototype = {
     // Send media URL (but not for canvas, since it's a big data: URL)
     this.showItem("context-sendimage", this.onImage);
     this.showItem("context-sendvideo", this.onVideo);
-    this.showItem("context-castvideo", this.onVideo);
     this.showItem("context-sendaudio", this.onAudio);
     this.setItemAttr("context-sendvideo", "disabled", !this.mediaURL);
     this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL);
-    // getServicesForVideo alone would be sufficient here (it depends on
-    // SimpleServiceDiscovery.services), but SimpleServiceDiscovery is garanteed
-    // to be already loaded, since we load it on startup, and CastingApps isn't,
-    // so check SimpleServiceDiscovery.services first to avoid needing to load
-    // CastingApps.jsm if we don't need to.
-    let shouldShowCast = this.mediaURL &&
-                         SimpleServiceDiscovery.services.length > 0 &&
-                         CastingApps.getServicesForVideo(this.target).length > 0;
-    this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -1326,25 +1316,6 @@ nsContextMenu.prototype = {
     MailIntegration.sendMessage(this.mediaURL, "");
   },
 
-  castVideo: function() {
-    CastingApps.openExternal(this.target, window);
-  },
-
-  populateCastVideoMenu: function(popup) {
-    let videoEl = this.target;
-    popup.innerHTML = null;
-    let doc = popup.ownerDocument;
-    let services = CastingApps.getServicesForVideo(videoEl);
-    services.forEach(service => {
-      let item = doc.createElement("menuitem");
-      item.setAttribute("label", service.friendlyName);
-      item.addEventListener("command", event => {
-        CastingApps.sendVideoToService(videoEl, service);
-      });
-      popup.appendChild(item);
-    });
-  },
-
   playPlugin: function() {
     gPluginHandler.contextMenuCommand(this.browser, this.target, "play");
   },
diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index 856494036637..20c86b4534a7 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -174,8 +174,7 @@ function runTest(testNum) {
                           "---",                        null,
                           "context-savevideo",          true,
                           "context-video-saveimage",    true,
-                          "context-sendvideo",          true,
-                          "context-castvideo",          false
+                          "context-sendvideo",          true
                          ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 5acb094f716e..abd2504a910e 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -99,9 +99,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
 XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
                                   "resource://gre/modules/LoginManagerParent.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
-                                  "resource://gre/modules/SimpleServiceDiscovery.jsm");
-
 #ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "SignInToWebsiteUX",
                                   "resource:///modules/SignInToWebsite.jsm");
@@ -750,30 +747,8 @@ BrowserGlue.prototype = {
     FormValidationHandler.uninit();
   },
 
-  _initServiceDiscovery: function () {
-    var rokuDevice = {
-      id: "roku:ecp",
-      target: "roku:ecp",
-      factory: function(aService) {
-        Cu.import("resource://gre/modules/RokuApp.jsm");
-        return new RokuApp(aService);
-      },
-      mirror: false,
-      types: ["video/mp4"],
-      extensions: ["mp4"]
-    };
-
-    // Register targets
-    SimpleServiceDiscovery.registerDevice(rokuDevice);
-
-    // Search for devices continuously every 120 seconds
-    SimpleServiceDiscovery.search(120 * 1000);
-  },
-
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
-    this._initServiceDiscovery();
-
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 03d438e1923a..29f515d814c0 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -484,8 +484,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
-<!ENTITY castVideoCmd.label           "Send Video To Device">
-<!ENTITY castVideoCmd.accesskey       "c">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
diff --git a/browser/modules/CastingApps.jsm b/browser/modules/CastingApps.jsm
deleted file mode 100644
index df974f04f606..000000000000
--- a/browser/modules/CastingApps.jsm
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
-/* 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/. */
-"use strict";
-this.EXPORTED_SYMBOLS = ["CastingApps"];
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
-
-
-var CastingApps = {
-  _sendEventToVideo: function (element, data) {
-    let event = element.ownerDocument.createEvent("CustomEvent");
-    event.initCustomEvent("media-videoCasting", false, true, JSON.stringify(data));
-    element.dispatchEvent(event);
-  },
-
-  makeURI: function (url, charset, baseURI) {
-    return Services.io.newURI(url, charset, baseURI);
-  },
-
-  getVideo: function (element) {
-    if (!element) {
-      return null;
-    }
-
-    let extensions = SimpleServiceDiscovery.getSupportedExtensions();
-    let types = SimpleServiceDiscovery.getSupportedMimeTypes();
-
-    // Grab the poster attribute from the <video>
-    let posterURL = element.poster;
-
-    // First, look to see if the <video> has a src attribute
-    let sourceURL = element.src;
-
-    // If empty, try the currentSrc
-    if (!sourceURL) {
-      sourceURL = element.currentSrc;
-    }
-
-    if (sourceURL) {
-      // Use the file extension to guess the mime type
-      let sourceURI = this.makeURI(sourceURL, null, this.makeURI(element.baseURI));
-      if (this.allowableExtension(sourceURI, extensions)) {
-        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI};
-      }
-    }
-
-    // Next, look to see if there is a <source> child element that meets
-    // our needs
-    let sourceNodes = element.getElementsByTagName("source");
-    for (let sourceNode of sourceNodes) {
-      let sourceURI = this.makeURI(sourceNode.src, null, this.makeURI(sourceNode.baseURI));
-
-      // Using the type attribute is our ideal way to guess the mime type. Otherwise,
-      // fallback to using the file extension to guess the mime type
-      if (this.allowableMimeType(sourceNode.type, types) || this.allowableExtension(sourceURI, extensions)) {
-        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI, type: sourceNode.type };
-      }
-    }
-
-    return null;
-  },
-
-  sendVideoToService: function (videoElement, service) {
-    if (!service)
-      return;
-
-    let video = this.getVideo(videoElement);
-    if (!video) {
-      return;
-    }
-
-    // Make sure we have a player app for the given service
-    let app = SimpleServiceDiscovery.findAppForService(service);
-    if (!app)
-      return;
-
-    video.title = videoElement.ownerDocument.defaultView.top.document.title;
-    if (video.element) {
-      // If the video is currently playing on the device, pause it
-      if (!video.element.paused) {
-        video.element.pause();
-      }
-    }
-
-    app.stop(() => {
-      app.start(started => {
-        if (!started) {
-          Cu.reportError("CastingApps: Unable to start app");
-          return;
-        }
-
-        app.remoteMedia(remoteMedia => {
-          if (!remoteMedia) {
-            Cu.reportError("CastingApps: Failed to create remotemedia");
-            return;
-          }
-
-          this.session = {
-            service: service,
-            app: app,
-            remoteMedia: remoteMedia,
-            data: {
-              title: video.title,
-              source: video.source,
-              poster: video.poster
-            },
-            videoRef: Cu.getWeakReference(video.element)
-          };
-        }, this);
-      });
-    });
-  },
-
-  getServicesForVideo: function (videoElement) {
-    let video = this.getVideo(videoElement);
-    if (!video) {
-      return {};
-    }
-
-    let filteredServices = SimpleServiceDiscovery.services.filter(service => {
-      return this.allowableExtension(video.sourceURI, service.extensions) ||
-             this.allowableMimeType(video.type, service.types);
-    });
-
-    return filteredServices;
-  },
-
-  // RemoteMedia callback API methods
-  onRemoteMediaStart: function (remoteMedia) {
-    if (!this.session) {
-      return;
-    }
-
-    remoteMedia.load(this.session.data);
-
-    let video = this.session.videoRef.get();
-    if (video) {
-      this._sendEventToVideo(video, { active: true });
-    }
-  },
-
-  onRemoteMediaStop: function (remoteMedia) {
-  },
-
-  onRemoteMediaStatus: function (remoteMedia) {
-  },
-
-  allowableExtension: function (uri, extensions) {
-    return (uri instanceof Ci.nsIURL) && extensions.indexOf(uri.fileExtension) != -1;
-  },
-
-  allowableMimeType: function (type, types) {
-    return types.indexOf(type) != -1;
-  }
-};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 06d5d7404174..602edae252ea 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -14,7 +14,6 @@ XPCSHELL_TESTS_MANIFESTS += [
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
-    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
diff --git a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
index bca051562580..c06cbfaaf189 100644
--- a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
+++ b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
@@ -135,9 +135,7 @@ var SimpleServiceDiscovery = {
 
   _usingLAN: function() {
     let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
-    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI ||
-            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET ||
-            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_UNKNOWN);
+    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI || network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET);
   },
 
   _search: function _search() {

From 5b707295d798ed399e75bfde472b41189f145f9a Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Thu, 16 Oct 2014 15:40:47 -0700
Subject: [PATCH 16/46] Backed out changeset 8a4b1c63f433 (bug 1080055) for
 ASAN bc1 orange on a CLOSED TREE

---
 browser/base/content/tabbrowser.xml           |  14 +-
 browser/base/content/test/general/browser.ini |   1 -
 .../test/general/browser_restore_isAppTab.js  | 150 ------------------
 browser/base/content/test/general/head.js     |   6 +-
 4 files changed, 5 insertions(+), 166 deletions(-)
 delete mode 100644 browser/base/content/test/general/browser_restore_isAppTab.js

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 4b8dc96b0f6e..014b8a1762f8 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1481,12 +1481,10 @@
             // Restore the progress listener.
             aBrowser.webProgress.addProgressListener(filter, Ci.nsIWebProgress.NOTIFY_ALL);
 
-            if (aShouldBeRemote) {
+            if (aShouldBeRemote)
               tab.setAttribute("remote", "true");
-            } else {
+            else
               tab.removeAttribute("remote");
-              aBrowser.messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: tab.pinned })
-            }
 
             if (wasActive)
               aBrowser.focus();
@@ -3097,13 +3095,6 @@
               window.focus();
               break;
             }
-            case "Browser:Init": {
-              let tab = this.getTabForBrowser(browser);
-              if (!tab)
-                return;
-              browser.messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: tab.pinned })
-              break;
-            }
           }
         ]]></body>
       </method>
@@ -3161,7 +3152,6 @@
             messageManager.addMessageListener("DOMTitleChanged", this);
             messageManager.addMessageListener("DOMWindowClose", this);
             messageManager.addMessageListener("contextmenu", this);
-            messageManager.addMessageListener("Browser:Init", this);
 
             // If this window has remote tabs, switch to our tabpanels fork
             // which does asynchronous tab switching.
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 68a09499511f..6b4a29aa85f2 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -388,7 +388,6 @@ skip-if = buildapp == 'mulet'
 [browser_removeTabsToTheEnd.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
 skip-if = e10s
-[browser_restore_isAppTab.js]
 [browser_sanitize-download-history.js]
 skip-if = true # bug 432425
 [browser_sanitize-passwordDisabledHosts.js]
diff --git a/browser/base/content/test/general/browser_restore_isAppTab.js b/browser/base/content/test/general/browser_restore_isAppTab.js
deleted file mode 100644
index b0c58206315d..000000000000
--- a/browser/base/content/test/general/browser_restore_isAppTab.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const DUMMY = "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
-
-function getMinidumpDirectory() {
-  let dir = Services.dirsvc.get('ProfD', Ci.nsIFile);
-  dir.append("minidumps");
-  return dir;
-}
-
-// This observer is needed so we can clean up all evidence of the crash so
-// the testrunner thinks things are peachy.
-let CrashObserver = {
-  observe: function(subject, topic, data) {
-    is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
-    ok(subject instanceof Ci.nsIPropertyBag2,
-       'Subject implements nsIPropertyBag2.');
-    // we might see this called as the process terminates due to previous tests.
-    // We are only looking for "abnormal" exits...
-    if (!subject.hasKey("abnormal")) {
-      info("This is a normal termination and isn't the one we are looking for...");
-      return;
-    }
-
-    let dumpID;
-    if ('nsICrashReporter' in Ci) {
-      dumpID = subject.getPropertyAsAString('dumpID');
-      ok(dumpID, "dumpID is present and not an empty string");
-    }
-
-    if (dumpID) {
-      let minidumpDirectory = getMinidumpDirectory();
-      let file = minidumpDirectory.clone();
-      file.append(dumpID + '.dmp');
-      file.remove(true);
-      file = minidumpDirectory.clone();
-      file.append(dumpID + '.extra');
-      file.remove(true);
-    }
-  }
-}
-Services.obs.addObserver(CrashObserver, 'ipc:content-shutdown', false);
-
-registerCleanupFunction(() => {
-  Services.obs.removeObserver(CrashObserver, 'ipc:content-shutdown');
-});
-
-function frameScript() {
-  addMessageListener("Test:GetIsAppTab", function() {
-    sendAsyncMessage("Test:IsAppTab", { isAppTab: docShell.isAppTab });
-  });
-
-  addMessageListener("Test:Crash", function() {
-    privateNoteIntentionalCrash();
-    Components.utils.import("resource://gre/modules/ctypes.jsm");
-    let zero = new ctypes.intptr_t(8);
-    let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
-    badptr.contents
-  });
-}
-
-function loadFrameScript(browser) {
-  browser.messageManager.loadFrameScript("data:,(" + frameScript.toString() + ")();", true);
-}
-
-function isBrowserAppTab(browser) {
-  return new Promise(resolve => {
-    function listener({ data }) {
-      browser.messageManager.removeMessageListener("Test:IsAppTab", listener);
-      resolve(data.isAppTab);
-    }
-    browser.messageManager.addMessageListener("Test:IsAppTab", listener);
-    browser.messageManager.sendAsyncMessage("Test:GetIsAppTab");
-  });
-}
-
-// Restarts the child process by crashing it then reloading the tab
-let restart = Task.async(function*(browser) {
-  // If the tab isn't remote this would crash the main process so skip it
-  if (!browser.isRemoteBrowser)
-    return browser;
-
-  browser.messageManager.sendAsyncMessage("Test:Crash");
-  yield promiseWaitForEvent(browser, "AboutTabCrashedLoad", false, true);
-
-  TabCrashReporter.reloadCrashedTab(browser);
-
-  yield promiseTabLoaded(gBrowser.getTabForBrowser(browser));
-});
-
-add_task(function* navigate() {
-  let tab = gBrowser.addTab("about:robots");
-  let browser = tab.linkedBrowser;
-  gBrowser.selectedTab = tab;
-  yield waitForDocLoadComplete();
-  loadFrameScript(browser);
-  let isAppTab = yield isBrowserAppTab(browser);
-  ok(!isAppTab, "Docshell shouldn't think it is an app tab");
-
-  gBrowser.pinTab(tab);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(isAppTab, "Docshell should think it is an app tab");
-
-  gBrowser.loadURI(DUMMY);
-  yield waitForDocLoadComplete();
-  loadFrameScript(browser);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(isAppTab, "Docshell should think it is an app tab");
-
-  gBrowser.unpinTab(tab);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(!isAppTab, "Docshell shouldn't think it is an app tab");
-
-  gBrowser.pinTab(tab);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(isAppTab, "Docshell should think it is an app tab");
-
-  gBrowser.loadURI("about:robots");
-  yield waitForDocLoadComplete();
-  loadFrameScript(browser);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(isAppTab, "Docshell should think it is an app tab");
-
-  gBrowser.removeCurrentTab();
-});
-
-add_task(function* crash() {
-  if (!gMultiProcessBrowser)
-    return;
-
-  let tab = gBrowser.addTab(DUMMY);
-  let browser = tab.linkedBrowser;
-  gBrowser.selectedTab = tab;
-  yield waitForDocLoadComplete();
-  loadFrameScript(browser);
-  let isAppTab = yield isBrowserAppTab(browser);
-  ok(!isAppTab, "Docshell shouldn't think it is an app tab");
-
-  gBrowser.pinTab(tab);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(isAppTab, "Docshell should think it is an app tab");
-
-  yield restart(browser);
-  loadFrameScript(browser);
-  isAppTab = yield isBrowserAppTab(browser);
-  ok(isAppTab, "Docshell should think it is an app tab");
-
-  gBrowser.removeCurrentTab();
-});
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
index 35865ef1b349..c62c2d49c9c4 100644
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -108,16 +108,16 @@ function promiseWaitForCondition(aConditionFn) {
   return deferred.promise;
 }
 
-function promiseWaitForEvent(object, eventName, capturing = false, chrome = false) {
+function promiseWaitForEvent(object, eventName, capturing = false) {
   return new Promise((resolve) => {
     function listener(event) {
       info("Saw " + eventName);
-      object.removeEventListener(eventName, listener, capturing, chrome);
+      object.removeEventListener(eventName, listener, capturing);
       resolve(event);
     }
 
     info("Waiting for " + eventName);
-    object.addEventListener(eventName, listener, capturing, chrome);
+    object.addEventListener(eventName, listener, capturing);
   });
 }
 

From 463b49d0812cf42e02b810f34a814f64448c80b7 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 16 Oct 2014 15:00:12 -0700
Subject: [PATCH 17/46] Bug 1083895 - favicon should not change if link element
 isn't in DOM, r=bz

--HG--
extra : rebase_source : 6d8c8e5ecab8021fa5d42ba4b6fc82a7315fcc79
---
 browser/base/content/test/general/browser.ini |  3 ++
 .../browser_favicon_change_not_in_document.js | 34 +++++++++++++++++++
 .../file_favicon_change_not_in_document.html  | 21 ++++++++++++
 content/html/content/src/HTMLLinkElement.cpp  |  8 +++--
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 browser/base/content/test/general/browser_favicon_change_not_in_document.js
 create mode 100644 browser/base/content/test/general/file_favicon_change_not_in_document.html

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 6b4a29aa85f2..f6d87d9aa56c 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -57,6 +57,7 @@ support-files =
   file_dom_notifications.html
   file_double_close_tab.html
   file_favicon_change.html
+  file_favicon_change_not_in_document.html
   file_fullscreen-window-open.html
   get_user_media.html
   head.js
@@ -324,6 +325,8 @@ skip-if = e10s
 skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
 [browser_favicon_change.js]
 skip-if = e10s
+[browser_favicon_change_not_in_document.js]
+skip-if = e10s
 [browser_findbarClose.js]
 skip-if = e10s # Bug ?????? - test directly manipulates content (tries to grab an iframe directly from content)
 [browser_fullscreen-window-open.js]
diff --git a/browser/base/content/test/general/browser_favicon_change_not_in_document.js b/browser/base/content/test/general/browser_favicon_change_not_in_document.js
new file mode 100644
index 000000000000..d14a1da3231f
--- /dev/null
+++ b/browser/base/content/test/general/browser_favicon_change_not_in_document.js
@@ -0,0 +1,34 @@
+"use strict";
+
+const TEST_URL = "http://mochi.test:8888/browser/browser/base/content/test/general/file_favicon_change_not_in_document.html"
+
+add_task(function*() {
+  let extraTab = gBrowser.selectedTab = gBrowser.addTab();
+  let tabLoaded = promiseTabLoaded(extraTab);
+  extraTab.linkedBrowser.loadURI(TEST_URL);
+  let expectedFavicon = "http://example.org/one-icon";
+  let haveChanged = new Promise.defer();
+  let observer = new MutationObserver(function(mutations) {
+    for (let mut of mutations) {
+      if (mut.attributeName != "image") {
+        continue;
+      }
+      let imageVal = extraTab.getAttribute("image").replace(/#.*$/, "");
+      if (!imageVal) {
+        // The value gets removed because it doesn't load.
+        continue;
+      }
+      is(imageVal, expectedFavicon, "Favicon image should correspond to expected image.");
+      haveChanged.resolve();
+    }
+  });
+  observer.observe(extraTab, {attributes: true});
+  yield tabLoaded;
+  expectedFavicon = "http://example.org/yet-another-icon";
+  haveChanged = new Promise.defer();
+  yield haveChanged.promise;
+  observer.disconnect();
+  gBrowser.removeTab(extraTab);
+});
+
+
diff --git a/browser/base/content/test/general/file_favicon_change_not_in_document.html b/browser/base/content/test/general/file_favicon_change_not_in_document.html
new file mode 100644
index 000000000000..deebb07dcbaf
--- /dev/null
+++ b/browser/base/content/test/general/file_favicon_change_not_in_document.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html><head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <link rel="icon" href="http://example.org/one-icon" type="image/ico" id="i">
+</head>
+<body onload="onload()">
+  <script>
+  function onload() {
+    var ico = document.createElement("link");
+    ico.setAttribute("rel", "icon");
+    ico.setAttribute("type", "image/ico");
+    ico.setAttribute("href", "http://example.org/other-icon");
+    setTimeout(function() {
+      ico.setAttribute("href", "http://example.org/yet-another-icon");
+      document.getElementById("i").remove();
+      document.head.appendChild(ico);
+    }, 1000);
+  }
+  </script>
+</body></html>
+
diff --git a/content/html/content/src/HTMLLinkElement.cpp b/content/html/content/src/HTMLLinkElement.cpp
index 6f7b88a61855..502ac7dbf492 100644
--- a/content/html/content/src/HTMLLinkElement.cpp
+++ b/content/html/content/src/HTMLLinkElement.cpp
@@ -307,7 +307,9 @@ HTMLLinkElement::SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
   // to get updated information about the visitedness from Link.
   if (aName == nsGkAtoms::href && kNameSpaceID_None == aNameSpaceID) {
     Link::ResetLinkState(!!aNotify, true);
-    CreateAndDispatchEvent(OwnerDoc(), NS_LITERAL_STRING("DOMLinkChanged"));
+    if (IsInUncomposedDoc()) {
+      CreateAndDispatchEvent(OwnerDoc(), NS_LITERAL_STRING("DOMLinkChanged"));
+    }
   }
 
   if (NS_SUCCEEDED(rv) && aNameSpaceID == kNameSpaceID_None &&
@@ -370,7 +372,9 @@ HTMLLinkElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
   // to get updated information about the visitedness from Link.
   if (aAttribute == nsGkAtoms::href && kNameSpaceID_None == aNameSpaceID) {
     Link::ResetLinkState(!!aNotify, false);
-    CreateAndDispatchEvent(OwnerDoc(), NS_LITERAL_STRING("DOMLinkChanged"));
+    if (IsInUncomposedDoc()) {
+      CreateAndDispatchEvent(OwnerDoc(), NS_LITERAL_STRING("DOMLinkChanged"));
+    }
   }
 
   return rv;

From f947d75c0d5737b1c9ab82105a492869d65287c5 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 16 Oct 2014 15:01:32 -0700
Subject: [PATCH 18/46] Bug 1079707 - asyncresolve can throw, r=alexbardas

--HG--
extra : rebase_source : e1a83fed31780d9e1d56dc795e157e17525ff9f6
---
 browser/base/content/browser.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e5a2d47c94a2..e5574c86add1 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -782,7 +782,15 @@ function gKeywordURIFixup({ target: browser, data: fixupInfo }) {
     notification.persistence = 1;
   };
 
-  gDNSService.asyncResolve(hostName, 0, onLookupComplete, Services.tm.mainThread);
+  try {
+    gDNSService.asyncResolve(hostName, 0, onLookupComplete, Services.tm.mainThread);
+  } catch (ex) {
+    // Do nothing if the URL is invalid (we don't want to show a notification in that case).
+    if (ex.result != Cr.NS_ERROR_UNKNOWN_HOST) {
+      // ... otherwise, report:
+      Cu.reportError(ex);
+    }
+  }
 }
 
 // Called when a docshell has attempted to load a page in an incorrect process.

From b7c481e472fa741f777ba918e24944c07893b971 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Thu, 16 Oct 2014 16:19:58 -0700
Subject: [PATCH 19/46] Bug 1081072: Remove scrollbar opacity transition from
 b2g content.css file, since it interacts poorly with ScrollbarActivity.cpp.
 r=fabrice

---
 b2g/chrome/content/content.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/b2g/chrome/content/content.css b/b2g/chrome/content/content.css
index 645ab3d384ac..d354dc2713d2 100644
--- a/b2g/chrome/content/content.css
+++ b/b2g/chrome/content/content.css
@@ -28,7 +28,6 @@ html xul|scrollbar {
   background-image: none !important;
   border: 0px solid transparent !important;
   pointer-events: none;
-  opacity: 1;
 }
 
 xul|scrollbar[orient="vertical"] {
@@ -56,7 +55,6 @@ xul|scrollbar[orient="horizontal"] xul|thumb {
 xul|scrollbar:not([active="true"]),
 xul|scrollbar[disabled] {
   opacity: 0;
-  transition: opacity 1s ease;
 }
 
 xul|scrollbarbutton {

From 21f3b13913938970fc8cb6c9e09cab659d4daacf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 16:45:55 -0700
Subject: [PATCH 20/46] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fa83194807e1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25237 from mikehenrty/KevinGrandon-bug_1083571_bholley_wip_patch

Bug 1083571 - Remove __exposedProps__ from marionette shims

========

https://hg.mozilla.org/integration/gaia-central/rev/f4546793283f
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1083571 - Waive XRays for sms message event

========

https://hg.mozilla.org/integration/gaia-central/rev/40dd8297f0c3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1083571 - Remove __exposedProps__ from marionette shims
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index b969aaa98df5..097c5aa1ec7a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "63436aa17e7fa3ad521fdeffdc22b81c36e5d69b", 
+    "revision": "fa83194807e102168ff248c55bae0e7ffa3e05bd", 
     "repo_path": "/integration/gaia-central"
 }

From 3e725b0e8999bc6115ed416d62a492821dc672e1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 16:52:03 -0700
Subject: [PATCH 21/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index fc8928aa36da..345ebbb81cb3 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ffce04229cc9..12e3b87afaac 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index f3edc6c260d6..5abc889a9473 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6cce451a7299..df657a4a8cb0 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ffce04229cc9..12e3b87afaac 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 131ce198a071..3552823eb268 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 29f57f20b0f2..5172e99b80c3 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index ddf7a56c18b0..6845c4af4ad8 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index b95704c693f0..f88819fe8b2a 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 699092edd0d2..54e91a497275 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 6882bd535b45..bbcd2d793b6b 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abef62c0623e5504a97b4fd411e879a67b285b52"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 8b4f37b04596203bac4797a84e8e59cc45af6655 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 18:00:48 -0700
Subject: [PATCH 22/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/aaeecc098e23
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25176 from sudheesh001/Tests

Bug 1061513 - Fixes hint errors in tests/ directory r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/1b7e06118099
Author: sudheesh001 <sudheesh1995@outlook.com>
Desc: Bug 1061513 Fixes hint errors in tests/ directory r=kgrandon
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 097c5aa1ec7a..de8f065fb5b5 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "fa83194807e102168ff248c55bae0e7ffa3e05bd", 
+    "revision": "aaeecc098e230c26ff11fb5b66b6ed97e58d9822", 
     "repo_path": "/integration/gaia-central"
 }

From 335cfb0fb4f6bb41b408c90578a7f57049d0ce5b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 18:06:56 -0700
Subject: [PATCH 23/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 345ebbb81cb3..0fed7ac5831d 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 12e3b87afaac..517c795399ee 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 5abc889a9473..3dd06f90e89a 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index df657a4a8cb0..bede7a020cd9 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 12e3b87afaac..517c795399ee 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 3552823eb268..09bf4d40c996 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 5172e99b80c3..a4739c38654b 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 6845c4af4ad8..b01a06d64930 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index f88819fe8b2a..a830f8adaf85 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 54e91a497275..92ccc5f4b9e8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index bbcd2d793b6b..4120dde2a223 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3184634389eb4b2858ad8cf3125a09242b4a7d05"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 78face2506d1761a475d7809a2520230fe78b616 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@gmail.com>
Date: Thu, 16 Oct 2014 21:29:18 -0400
Subject: [PATCH 24/46] Bug 1048162 Part 2 - Display an error message if
 fetching an email link fails r=standard8,darrin

---
 .../loop/content/js/conversationViews.js      | 42 +++++++++++++++----
 .../loop/content/js/conversationViews.jsx     | 42 +++++++++++++++----
 .../loop/content/shared/css/conversation.css  |  6 +++
 .../content/shared/js/conversationStore.js    |  3 +-
 .../desktop-local/conversationViews_test.js   | 18 ++++++++
 .../test/shared/conversationStore_test.js     | 13 +++++-
 browser/components/loop/ui/ui-showcase.js     |  6 +++
 browser/components/loop/ui/ui-showcase.jsx    |  6 +++
 8 files changed, 114 insertions(+), 22 deletions(-)

diff --git a/browser/components/loop/content/js/conversationViews.js b/browser/components/loop/content/js/conversationViews.js
index bd93cd9c3135..a4970a6a6ba2 100644
--- a/browser/components/loop/content/js/conversationViews.js
+++ b/browser/components/loop/content/js/conversationViews.js
@@ -171,12 +171,10 @@ loop.conversationViews = (function(mozL10n) {
           React.DOM.p({className: "btn-label"}, pendingStateString), 
 
           React.DOM.div({className: "btn-group call-action-group"}, 
-            React.DOM.div({className: "fx-embedded-call-button-spacer"}), 
-              React.DOM.button({className: btnCancelStyles, 
-                      onClick: this.cancelCall}, 
-                mozL10n.get("initiate_call_cancel_button")
-              ), 
-            React.DOM.div({className: "fx-embedded-call-button-spacer"})
+            React.DOM.button({className: btnCancelStyles, 
+                    onClick: this.cancelCall}, 
+              mozL10n.get("initiate_call_cancel_button")
+            )
           )
 
         )
@@ -194,16 +192,23 @@ loop.conversationViews = (function(mozL10n) {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       store: React.PropTypes.instanceOf(
         loop.store.ConversationStore).isRequired,
-      contact: React.PropTypes.object.isRequired
+      contact: React.PropTypes.object.isRequired,
+      // This is used by the UI showcase.
+      emailLinkError: React.PropTypes.bool,
     },
 
     getInitialState: function() {
-      return {emailLinkButtonDisabled: false};
+      return {
+        emailLinkError: this.props.emailLinkError,
+        emailLinkButtonDisabled: false
+      };
     },
 
     componentDidMount: function() {
       this.listenTo(this.props.store, "change:emailLink",
                     this._onEmailLinkReceived);
+      this.listenTo(this.props.store, "error:emailLink",
+                    this._onEmailLinkError);
     },
 
     componentWillUnmount: function() {
@@ -217,6 +222,20 @@ loop.conversationViews = (function(mozL10n) {
       window.close();
     },
 
+    _onEmailLinkError: function() {
+      this.setState({
+        emailLinkError: true,
+        emailLinkButtonDisabled: false
+      });
+    },
+
+    _renderError: function() {
+      if (!this.state.emailLinkError) {
+        return;
+      }
+      return React.DOM.p({className: "error"}, mozL10n.get("unable_retrieve_url"));
+    },
+
     retryCall: function() {
       this.props.dispatcher.dispatch(new sharedActions.RetryCall());
     },
@@ -226,7 +245,10 @@ loop.conversationViews = (function(mozL10n) {
     },
 
     emailLink: function() {
-      this.setState({emailLinkButtonDisabled: true});
+      this.setState({
+        emailLinkError: false,
+        emailLinkButtonDisabled: true
+      });
 
       this.props.dispatcher.dispatch(new sharedActions.FetchEmailLink());
     },
@@ -238,6 +260,8 @@ loop.conversationViews = (function(mozL10n) {
 
           React.DOM.p({className: "btn-label"}, mozL10n.get("generic_failure_with_reason2")), 
 
+          this._renderError(), 
+
           React.DOM.div({className: "btn-group call-action-group"}, 
             React.DOM.button({className: "btn btn-cancel", 
                     onClick: this.cancelCall}, 
diff --git a/browser/components/loop/content/js/conversationViews.jsx b/browser/components/loop/content/js/conversationViews.jsx
index 1265043cf49d..d5eb2e92ecfa 100644
--- a/browser/components/loop/content/js/conversationViews.jsx
+++ b/browser/components/loop/content/js/conversationViews.jsx
@@ -171,12 +171,10 @@ loop.conversationViews = (function(mozL10n) {
           <p className="btn-label">{pendingStateString}</p>
 
           <div className="btn-group call-action-group">
-            <div className="fx-embedded-call-button-spacer"></div>
-              <button className={btnCancelStyles}
-                      onClick={this.cancelCall}>
-                {mozL10n.get("initiate_call_cancel_button")}
-              </button>
-            <div className="fx-embedded-call-button-spacer"></div>
+            <button className={btnCancelStyles}
+                    onClick={this.cancelCall}>
+              {mozL10n.get("initiate_call_cancel_button")}
+            </button>
           </div>
 
         </ConversationDetailView>
@@ -194,16 +192,23 @@ loop.conversationViews = (function(mozL10n) {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       store: React.PropTypes.instanceOf(
         loop.store.ConversationStore).isRequired,
-      contact: React.PropTypes.object.isRequired
+      contact: React.PropTypes.object.isRequired,
+      // This is used by the UI showcase.
+      emailLinkError: React.PropTypes.bool,
     },
 
     getInitialState: function() {
-      return {emailLinkButtonDisabled: false};
+      return {
+        emailLinkError: this.props.emailLinkError,
+        emailLinkButtonDisabled: false
+      };
     },
 
     componentDidMount: function() {
       this.listenTo(this.props.store, "change:emailLink",
                     this._onEmailLinkReceived);
+      this.listenTo(this.props.store, "error:emailLink",
+                    this._onEmailLinkError);
     },
 
     componentWillUnmount: function() {
@@ -217,6 +222,20 @@ loop.conversationViews = (function(mozL10n) {
       window.close();
     },
 
+    _onEmailLinkError: function() {
+      this.setState({
+        emailLinkError: true,
+        emailLinkButtonDisabled: false
+      });
+    },
+
+    _renderError: function() {
+      if (!this.state.emailLinkError) {
+        return;
+      }
+      return <p className="error">{mozL10n.get("unable_retrieve_url")}</p>;
+    },
+
     retryCall: function() {
       this.props.dispatcher.dispatch(new sharedActions.RetryCall());
     },
@@ -226,7 +245,10 @@ loop.conversationViews = (function(mozL10n) {
     },
 
     emailLink: function() {
-      this.setState({emailLinkButtonDisabled: true});
+      this.setState({
+        emailLinkError: false,
+        emailLinkButtonDisabled: true
+      });
 
       this.props.dispatcher.dispatch(new sharedActions.FetchEmailLink());
     },
@@ -238,6 +260,8 @@ loop.conversationViews = (function(mozL10n) {
 
           <p className="btn-label">{mozL10n.get("generic_failure_with_reason2")}</p>
 
+          {this._renderError()}
+
           <div className="btn-group call-action-group">
             <button className="btn btn-cancel"
                     onClick={this.cancelCall}>
diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index ba316e77f006..766dd8dd1d9f 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -244,6 +244,12 @@
   text-align: center;
 }
 
+.call-window > .error {
+  text-align: center;
+  color: #f00;
+  font-size: 90%;
+}
+
 .call-action-group {
   display: flex;
   padding: 2.5em 4px 0 4px;
diff --git a/browser/components/loop/content/shared/js/conversationStore.js b/browser/components/loop/content/shared/js/conversationStore.js
index e328e484c4ff..9524bbfd7d96 100644
--- a/browser/components/loop/content/shared/js/conversationStore.js
+++ b/browser/components/loop/content/shared/js/conversationStore.js
@@ -313,8 +313,7 @@ loop.store.ConversationStore = (function() {
       // a user-set string.
       this.client.requestCallUrl("", function(err, callUrlData) {
         if (err) {
-          // XXX better error reporting in the UI
-          console.error(err);
+          this.trigger("error:emailLink");
           return;
         }
         this.set("emailLink", callUrlData.callUrl);
diff --git a/browser/components/loop/test/desktop-local/conversationViews_test.js b/browser/components/loop/test/desktop-local/conversationViews_test.js
index ffe881d61280..49612da7a913 100644
--- a/browser/components/loop/test/desktop-local/conversationViews_test.js
+++ b/browser/components/loop/test/desktop-local/conversationViews_test.js
@@ -288,6 +288,24 @@ describe("loop.conversationViews", function () {
 
         sinon.assert.calledOnce(window.close);
       });
+
+    it("should display an error message in case email link retrieval failed",
+      function() {
+        view = mountTestComponent();
+
+        store.trigger("error:emailLink");
+
+        expect(view.getDOMNode().querySelector(".error")).not.eql(null);
+      });
+
+    it("should allow retrying to get a call url if it failed previously",
+      function() {
+        view = mountTestComponent();
+
+        store.trigger("error:emailLink");
+
+        expect(view.getDOMNode().querySelector(".btn-email").disabled).eql(false);
+      });
   });
 
   describe("OngoingConversationView", function() {
diff --git a/browser/components/loop/test/shared/conversationStore_test.js b/browser/components/loop/test/shared/conversationStore_test.js
index 75d944cb67e8..ff4d9e2398b0 100644
--- a/browser/components/loop/test/shared/conversationStore_test.js
+++ b/browser/components/loop/test/shared/conversationStore_test.js
@@ -658,8 +658,17 @@ describe("loop.store.ConversationStore", function () {
         expect(store.get("emailLink")).eql("http://fake.invalid/");
       });
 
-    // XXX bug 1048162 Part 2
-    it.skip("should trigger an error in case of failure");
+    it("should trigger an error:emailLink event in case of failure",
+      function() {
+        var trigger = sandbox.stub(store, "trigger");
+        client.requestCallUrl = function(callId, cb) {
+          cb("error");
+        };
+        dispatcher.dispatch(new sharedActions.FetchEmailLink());
+
+        sinon.assert.calledOnce(trigger);
+        sinon.assert.calledWithExactly(trigger, "error:emailLink");
+      });
   });
 
   describe("Events", function() {
diff --git a/browser/components/loop/ui/ui-showcase.js b/browser/components/loop/ui/ui-showcase.js
index d04b11f98a68..89140ee56de5 100644
--- a/browser/components/loop/ui/ui-showcase.js
+++ b/browser/components/loop/ui/ui-showcase.js
@@ -312,6 +312,12 @@
               React.DOM.div({className: "fx-embedded"}, 
                 CallFailedView({dispatcher: dispatcher})
               )
+            ), 
+            Example({summary: "Call Failed — with call URL error", dashed: "true", 
+                     style: {width: "260px", height: "265px"}}, 
+              React.DOM.div({className: "fx-embedded"}, 
+                CallFailedView({dispatcher: dispatcher, emailLinkError: true})
+              )
             )
           ), 
 
diff --git a/browser/components/loop/ui/ui-showcase.jsx b/browser/components/loop/ui/ui-showcase.jsx
index dafe37a6dca3..5802b90c9d2f 100644
--- a/browser/components/loop/ui/ui-showcase.jsx
+++ b/browser/components/loop/ui/ui-showcase.jsx
@@ -313,6 +313,12 @@
                 <CallFailedView dispatcher={dispatcher} />
               </div>
             </Example>
+            <Example summary="Call Failed — with call URL error" dashed="true"
+                     style={{width: "260px", height: "265px"}}>
+              <div className="fx-embedded">
+                <CallFailedView dispatcher={dispatcher} emailLinkError={true} />
+              </div>
+            </Example>
           </Section>
 
           <Section name="StartConversationView">

From ec078e1cd27676b50a1cb748fa112e60f9b21192 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 17 Oct 2014 13:06:38 +1100
Subject: [PATCH 25/46] Bug 984172 (part 1) - add Assert.rejects. r=mikedeboer

---
 testing/modules/Assert.jsm                    | 35 +++++++++++++++
 testing/modules/tests/xpcshell/test_assert.js | 43 +++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/testing/modules/Assert.jsm b/testing/modules/Assert.jsm
index 6f59b031f642..f2667c3d93b7 100644
--- a/testing/modules/Assert.jsm
+++ b/testing/modules/Assert.jsm
@@ -16,6 +16,10 @@ this.EXPORTED_SYMBOLS = [
   "Assert"
 ];
 
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+                                  "resource://gre/modules/Promise.jsm");
 /**
  * 1. The assert module provides functions that throw AssertionError's when
  * particular conditions are not met.
@@ -442,3 +446,34 @@ proto.throws = function(block, expected, message) {
 
   this.report(false, expected, expected, message);
 };
+
+/**
+ * A promise that is expected to reject:
+ * assert.rejects(promise, expected, message);
+ *
+ * @param promise
+ *        (promise) A promise that is expected to reject
+ * @param expected (optional)
+ *        (mixed) Test reference to evaluate against the rejection result
+ * @param message (optional)
+ *        (string) Short explanation of the expected result
+ */
+proto.rejects = function(promise, expected, message) {
+  return new Promise((resolve, reject) => {
+    if (typeof expected === "string") {
+      message = expected;
+      expected = null;
+    }
+    return promise.then(
+      () => this.report(true, null, expected, "Missing expected exception " + message),
+      err => {
+        if (expected && !expectedException(err, expected)) {
+          reject(err);
+          return;
+        }
+        this.report(false, err, expected, message);
+        resolve();
+      }
+    ).then(null, reject);
+  });
+};
diff --git a/testing/modules/tests/xpcshell/test_assert.js b/testing/modules/tests/xpcshell/test_assert.js
index e2bc8c083fdc..c36aed2014c5 100644
--- a/testing/modules/tests/xpcshell/test_assert.js
+++ b/testing/modules/tests/xpcshell/test_assert.js
@@ -297,4 +297,47 @@ function run_test() {
     expected: "foo",
     operator: "="
   }).message, "[object Object] = \"foo\"");
+
+  run_next_test();
 }
+
+add_task(function* test_rejects() {
+  let ns = {};
+  Components.utils.import("resource://testing-common/Assert.jsm", ns);
+  let assert = new ns.Assert();
+
+  // A helper function to test failures.
+  function* checkRejectsFails(err, expected) {
+    try {
+      yield assert.rejects(Promise.reject(err), expected);
+      ok(false, "should have thrown");
+    } catch(ex) {
+      deepEqual(ex, err, "Assert.rejects threw the original unexpected error");
+    }
+  }
+
+  // A "throwable" error that's not an actual Error().
+  let SomeErrorLikeThing = function() {};
+
+  // The actual tests...
+  // No "expected" or "message" values supplied.
+  yield assert.rejects(Promise.reject(new Error("oh no")));
+  yield assert.rejects(Promise.reject("oh no"));
+
+  // An explicit error object:
+  // An instance to check against.
+  yield assert.rejects(Promise.reject(new Error("oh no")), Error, "rejected");
+  // A regex to match against the message.
+  yield assert.rejects(Promise.reject(new Error("oh no")), /oh no/, "rejected");
+
+  // Failure cases:
+  // An instance to check against that doesn't match.
+  yield checkRejectsFails(new Error("something else"), SomeErrorLikeThing);
+  // A regex that doesn't match.
+  yield checkRejectsFails(new Error("something else"), /oh no/);
+
+  // Check simple string messages.
+  yield assert.rejects(Promise.reject("oh no"), /oh no/, "rejected");
+  // Wrong message.
+  yield checkRejectsFails("something else", /oh no/);
+});

From 9c34a28832bf246df3d9aed55997c2230849179a Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 17 Oct 2014 13:06:39 +1100
Subject: [PATCH 26/46] Bug 984172 (part 2) - replace Assert_rejects with
 Assert.rejects. r=ttaubert

---
 services/sync/modules-testing/fxa_utils.js     | 12 ------------
 .../sync/tests/unit/test_browserid_identity.js | 18 +++++++++---------
 .../tests/unit/test_fxa_service_cluster.js     |  4 ++--
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/services/sync/modules-testing/fxa_utils.js b/services/sync/modules-testing/fxa_utils.js
index ad0c05236ca3..4c622660a8da 100644
--- a/services/sync/modules-testing/fxa_utils.js
+++ b/services/sync/modules-testing/fxa_utils.js
@@ -1,7 +1,6 @@
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
-  "Assert_rejects",
   "initializeIdentityWithTokenServerResponse",
 ];
 
@@ -14,17 +13,6 @@ Cu.import("resource://services-common/tokenserverclient.js");
 Cu.import("resource://testing-common/services/common/logging.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
-// This shouldn't be here - it should be part of the xpcshell harness.
-// Maybe as Assert.rejects - so we name it like that.
-function Assert_rejects(promise, message) {
-  let deferred = Promise.defer();
-  promise.then(
-    () => deferred.reject(message || "Expected the promise to be rejected"),
-    deferred.resolve
-  );
-  return deferred.promise;
-}
-
 // Create a new browserid_identity object and initialize it with a
 // mocked TokenServerClient which always receives the specified response.
 this.initializeIdentityWithTokenServerResponse = function(response) {
diff --git a/services/sync/tests/unit/test_browserid_identity.js b/services/sync/tests/unit/test_browserid_identity.js
index f2ec7cc0a255..4cf39d93fffe 100644
--- a/services/sync/tests/unit/test_browserid_identity.js
+++ b/services/sync/tests/unit/test_browserid_identity.js
@@ -269,12 +269,12 @@ add_task(function test_ensureLoggedIn() {
   Assert.ok(!browseridManager._shouldHaveSyncKeyBundle,
             "_shouldHaveSyncKeyBundle should be false so we know we are testing what we think we are.");
   Status.login = LOGIN_FAILED_NO_USERNAME;
-  yield Assert_rejects(browseridManager.ensureLoggedIn(), "expecting rejection due to no user");
+  yield Assert.rejects(browseridManager.ensureLoggedIn(), "expecting rejection due to no user");
   Assert.ok(browseridManager._shouldHaveSyncKeyBundle,
             "_shouldHaveSyncKeyBundle should always be true after ensureLogin completes.");
   fxa.internal.currentAccountState.signedInUser = signedInUser;
   Status.login = LOGIN_FAILED_LOGIN_REJECTED;
-  yield Assert_rejects(browseridManager.ensureLoggedIn(),
+  yield Assert.rejects(browseridManager.ensureLoggedIn(),
                        "LOGIN_FAILED_LOGIN_REJECTED should have caused immediate rejection");
   Assert.equal(Status.login, LOGIN_FAILED_LOGIN_REJECTED,
                "status should remain LOGIN_FAILED_LOGIN_REJECTED");
@@ -360,7 +360,7 @@ add_task(function test_getTokenErrors() {
   let browseridManager = Service.identity;
 
   yield browseridManager.initializeWithCurrentIdentity();
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "should reject due to 401");
   Assert.equal(Status.login, LOGIN_FAILED_LOGIN_REJECTED, "login was rejected");
 
@@ -376,7 +376,7 @@ add_task(function test_getTokenErrors() {
   });
   browseridManager = Service.identity;
   yield browseridManager.initializeWithCurrentIdentity();
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "should reject due to non-JSON response");
   Assert.equal(Status.login, LOGIN_FAILED_NETWORK_ERROR, "login state is LOGIN_FAILED_NETWORK_ERROR");
 });
@@ -397,7 +397,7 @@ add_task(function test_getTokenErrorWithRetry() {
   let browseridManager = Service.identity;
 
   yield browseridManager.initializeWithCurrentIdentity();
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "should reject due to 503");
 
   // The observer should have fired - check it got the value in the response.
@@ -416,7 +416,7 @@ add_task(function test_getTokenErrorWithRetry() {
   browseridManager = Service.identity;
 
   yield browseridManager.initializeWithCurrentIdentity();
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "should reject due to no token in response");
 
   // The observer should have fired - check it got the value in the response.
@@ -448,7 +448,7 @@ add_task(function test_getKeysErrorWithBackoff() {
   });
 
   let browseridManager = Service.identity;
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "should reject due to 503");
 
   // The observer should have fired - check it got the value in the response.
@@ -482,7 +482,7 @@ add_task(function test_getKeysErrorWithRetry() {
   });
 
   let browseridManager = Service.identity;
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "should reject due to 503");
 
   // The observer should have fired - check it got the value in the response.
@@ -666,7 +666,7 @@ function* initializeIdentityWithHAWKResponseFactory(config, cbGetResponse) {
   browseridManager._fxaService = fxa;
   browseridManager._signedInUser = null;
   yield browseridManager.initializeWithCurrentIdentity();
-  yield Assert_rejects(browseridManager.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(browseridManager.whenReadyToAuthenticate.promise,
                        "expecting rejection due to hawk error");
 }
 
diff --git a/services/sync/tests/unit/test_fxa_service_cluster.js b/services/sync/tests/unit/test_fxa_service_cluster.js
index 8dc8cbef20f0..f6f97184a97a 100644
--- a/services/sync/tests/unit/test_fxa_service_cluster.js
+++ b/services/sync/tests/unit/test_fxa_service_cluster.js
@@ -17,7 +17,7 @@ add_task(function test_findCluster() {
   });
 
   yield Service.identity.initializeWithCurrentIdentity();
-  yield Assert_rejects(Service.identity.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(Service.identity.whenReadyToAuthenticate.promise,
                        "should reject due to 500");
 
   Assert.throws(function() {
@@ -32,7 +32,7 @@ add_task(function test_findCluster() {
   });
 
   yield Service.identity.initializeWithCurrentIdentity();
-  yield Assert_rejects(Service.identity.whenReadyToAuthenticate.promise,
+  yield Assert.rejects(Service.identity.whenReadyToAuthenticate.promise,
                        "should reject due to 401");
 
   cluster = Service._clusterManager._findCluster();

From 7f46e2bf2750c9080d1b172e8f7fc57de01e1625 Mon Sep 17 00:00:00 2001
From: Mark Capella <markcapella@twcny.rr.com>
Date: Thu, 16 Oct 2014 22:30:11 -0400
Subject: [PATCH 27/46] Bug 1057667 - Expand selection of articles available
 for viewing in ReaderMode, r=lucasr

---
 mobile/android/chrome/content/Readability.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mobile/android/chrome/content/Readability.js b/mobile/android/chrome/content/Readability.js
index a8164a74a8e6..def9d1acc473 100644
--- a/mobile/android/chrome/content/Readability.js
+++ b/mobile/android/chrome/content/Readability.js
@@ -585,7 +585,6 @@ Readability.prototype = {
       }
 
       let topCandidate = topCandidates[0] || null;
-      let lastTopCandidate = (topCandidates.length > 3 ? topCandidates[topCandidates.length - 1] : null);
 
       // If we still have no top candidate, just use the body as a last resort.
       // We also have to copy the body node so it is something we can modify.
@@ -704,17 +703,6 @@ Readability.prototype = {
           return null;
         }
       } else {
-        if (lastTopCandidate !== null) {
-          // EXPERIMENTAL: Contrast ratio is how we measure the level of competition between candidates in the
-          // readability algorithm. This is to avoid offering reader mode on pages that are more like
-          // a list or directory of links with summaries. It takes the score of the last top candidate
-          // (see N_TOP_CANDIDATES) and checks how it compares to the top candidate's. On pages that are not
-          // actual articles, there will likely be many candidates with similar score (i.e. higher contrast ratio).
-          let contrastRatio = lastTopCandidate.readability.contentScore / topCandidate.readability.contentScore;
-          if (contrastRatio > 0.45)
-            return null;
-        }
-
         return articleContent;
       }
     }

From 9388b058dc79727d46a15d29e8ce50c53724e1c0 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Thu, 16 Oct 2014 19:50:41 -0700
Subject: [PATCH 28/46] Bug 1064263 - Part 1: avoid crash when Sync is
 partially configured. r=nalexander

---
 .../service/sharemethods/SendTab.java         |  8 +++++
 .../ui/SendTabDeviceListArrayAdapter.java     | 29 ++++++++++---------
 .../android/base/overlays/ui/SendTabList.java | 12 ++------
 .../ui/SendTabTargetSelectedListener.java     |  7 +++++
 .../android/base/overlays/ui/ShareDialog.java | 22 +++++++-------
 5 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/mobile/android/base/overlays/service/sharemethods/SendTab.java b/mobile/android/base/overlays/service/sharemethods/SendTab.java
index 691684b23d52..fffa0baec60f 100644
--- a/mobile/android/base/overlays/service/sharemethods/SendTab.java
+++ b/mobile/android/base/overlays/service/sharemethods/SendTab.java
@@ -206,6 +206,13 @@ public class SendTab extends ShareMethod {
             i++;
         }
 
+        if (validGUIDs.isEmpty()) {
+            // Guess we'd better override. We have no clients.
+            // This does the broadcast for us.
+            setOverrideIntent(FxAccountGetStartedActivity.class);
+            return;
+        }
+
         Intent uiStateIntent = getUIStateIntent();
         uiStateIntent.putExtra(EXTRA_CLIENT_RECORDS, records);
         broadcastUIState(uiStateIntent);
@@ -230,6 +237,7 @@ public class SendTab extends ShareMethod {
 
         Intent uiStateIntent = getUIStateIntent();
         uiStateIntent.putExtra(OVERRIDE_INTENT, intent);
+
         broadcastUIState(uiStateIntent);
     }
 
diff --git a/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java b/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java
index 08f2beb7d134..32c6054ad88d 100644
--- a/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java
+++ b/mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java
@@ -112,24 +112,27 @@ public class SendTabDeviceListArrayAdapter extends ArrayAdapter<ParcelableClient
         }
 
         // The remaining states delegate to the SentTabTargetSelectedListener.
-        final String listenerGUID;
-
-        ParcelableClientRecord clientRecord = getItem(position);
+        final ParcelableClientRecord clientRecord = getItem(position);
         if (currentState == State.LIST) {
             row.setText(clientRecord.name);
             row.setCompoundDrawablesWithIntrinsicBounds(getImage(clientRecord), 0, 0, 0);
 
-            listenerGUID = clientRecord.guid;
-        } else {
-            listenerGUID = null;
-        }
+            final String listenerGUID = clientRecord.guid;
 
-        row.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                listener.onSendTabTargetSelected(listenerGUID);
-            }
-        });
+            row.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    listener.onSendTabTargetSelected(listenerGUID);
+                }
+            });
+        } else {
+            row.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    listener.onSendTabActionSelected();
+                }
+            });
+        }
 
         return row;
     }
diff --git a/mobile/android/base/overlays/ui/SendTabList.java b/mobile/android/base/overlays/ui/SendTabList.java
index e32da677a802..aa1885cca942 100644
--- a/mobile/android/base/overlays/ui/SendTabList.java
+++ b/mobile/android/base/overlays/ui/SendTabList.java
@@ -6,7 +6,6 @@ package org.mozilla.gecko.overlays.ui;
 
 import static org.mozilla.gecko.overlays.ui.SendTabList.State.LIST;
 import static org.mozilla.gecko.overlays.ui.SendTabList.State.LOADING;
-import static org.mozilla.gecko.overlays.ui.SendTabList.State.NONE;
 import static org.mozilla.gecko.overlays.ui.SendTabList.State.SHOW_DEVICES;
 
 import java.util.Arrays;
@@ -111,16 +110,9 @@ public class SendTabList extends ListView {
     public void setSyncClients(final ParcelableClientRecord[] c) {
         final ParcelableClientRecord[] clients = c == null ? new ParcelableClientRecord[0] : c;
 
-        int size = clients.length;
-        if (size == 0) {
-            // Just show a button to set up Sync (or whatever).
-            switchState(NONE);
-            return;
-        }
-
         clientListAdapter.setClientRecordList(Arrays.asList(clients));
 
-        if (size <= MAXIMUM_INLINE_ELEMENTS) {
+        if (clients.length <= MAXIMUM_INLINE_ELEMENTS) {
             // Show the list of devices in-line.
             switchState(LIST);
             return;
@@ -133,7 +125,7 @@ public class SendTabList extends ListView {
     /**
      * Get an AlertDialog listing all devices, allowing the user to select the one they want.
      * Used when more than MAXIMUM_INLINE_ELEMENTS devices are found (to avoid displaying them all
-     * inline and looking crazy.
+     * inline and looking crazy).
      */
     public AlertDialog getDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
diff --git a/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java b/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java
index 536b1ed5af8a..79da526da59c 100644
--- a/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java
+++ b/mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java
@@ -15,4 +15,11 @@ public interface SendTabTargetSelectedListener {
      * @param targetGUID The GUID of the ClientRecord the element represents (if any, otherwise null)
      */
     public void onSendTabTargetSelected(String targetGUID);
+
+    /**
+     * Called when the overall Send Tab item is clicked.
+     *
+     * This implies that the clients list was unavailable.
+     */
+    public void onSendTabActionSelected();
 }
diff --git a/mobile/android/base/overlays/ui/ShareDialog.java b/mobile/android/base/overlays/ui/ShareDialog.java
index 04a5b125c7d9..3dc7e5dd413d 100644
--- a/mobile/android/base/overlays/ui/ShareDialog.java
+++ b/mobile/android/base/overlays/ui/ShareDialog.java
@@ -295,14 +295,17 @@ public class ShareDialog extends LocaleAware.LocaleAwareActivity implements Send
      * launching Fennec").
      */
 
-    public void sendTab(String targetGUID) {
-        // If an override intent has been set, dispatch it.
-        if (sendTabOverrideIntent != null) {
-            startActivity(sendTabOverrideIntent);
-            finish();
-            return;
-        }
+    @Override
+    public void onSendTabActionSelected() {
+        // This requires an override intent.
+        Assert.isTrue(sendTabOverrideIntent != null);
 
+        startActivity(sendTabOverrideIntent);
+        finish();
+    }
+
+    @Override
+    public void onSendTabTargetSelected(String targetGUID) {
         // targetGUID being null with no override intent should be an impossible state.
         Assert.isTrue(targetGUID != null);
 
@@ -320,11 +323,6 @@ public class ShareDialog extends LocaleAware.LocaleAwareActivity implements Send
         slideOut();
     }
 
-    @Override
-    public void onSendTabTargetSelected(String targetGUID) {
-        sendTab(targetGUID);
-    }
-
     public void addToReadingList() {
         startService(getServiceIntent(ShareMethod.Type.ADD_TO_READING_LIST));
         slideOut();

From a174929b90eb118a08615db11f334b1a1f1d8c45 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 19:55:46 -0700
Subject: [PATCH 29/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/899748204da9
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #25159 from crh0716/1071366

Bug 1071366 - Add the missed case of erasing call forwarding settings r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/4aa05dba0080
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1071366 - Add the missed case of erasing call forwarding settings
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index de8f065fb5b5..ee3ff293441d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "aaeecc098e230c26ff11fb5b66b6ed97e58d9822", 
+    "revision": "899748204da92eae2ca95c20cc4d4aa2676d6a66", 
     "repo_path": "/integration/gaia-central"
 }

From a685228cc67237b75e7bd146c89da813a95a722f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 20:02:19 -0700
Subject: [PATCH 30/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 0fed7ac5831d..1ba822bb1697 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 517c795399ee..9940783797bd 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3dd06f90e89a..6b3ffd5e47b0 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index bede7a020cd9..4995ef4eb452 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 517c795399ee..9940783797bd 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 09bf4d40c996..feaa2a54a108 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index a4739c38654b..f5e7ea1f8e1f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b01a06d64930..d3721e475dbd 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index a830f8adaf85..88831fa031ff 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 92ccc5f4b9e8..926e55c48fe2 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 4120dde2a223..6f06c557a20d 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f72283cbe38ba0430fca62f6a25f9af20eac8c28"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From cb52f28eda8f9dbbed1486351dd6f42bd1338580 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 20:25:48 -0700
Subject: [PATCH 31/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/17b27134fb2a
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #25120 from crh0716/1082234

Bug 1082234 - Set a default value when the stored value is unavailable r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/2e9ce4bd3375
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1082234 - Set a default value when the stored value is unavailable
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ee3ff293441d..1ad543226a7a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "899748204da92eae2ca95c20cc4d4aa2676d6a66", 
+    "revision": "17b27134fb2a343703a2c2e0bf243932de4f1989", 
     "repo_path": "/integration/gaia-central"
 }

From 36cfd14e3ff7b21129efae9d4aba3d310df06ea2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 20:37:15 -0700
Subject: [PATCH 32/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 1ba822bb1697..f3d3bd31db82 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 9940783797bd..8badc3492ffd 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6b3ffd5e47b0..0872339d6899 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 4995ef4eb452..7ea86ff6035b 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 9940783797bd..8badc3492ffd 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index feaa2a54a108..800974b0afa7 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index f5e7ea1f8e1f..6b13f02e43f6 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index d3721e475dbd..f8a37db1e54a 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 88831fa031ff..eaef732383b3 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 926e55c48fe2..9410def1f256 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 6f06c557a20d..623e385a5cd5 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5da8e3ec8a93e3ed2f310ce4daa2508b1274468f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From f624e22e24f5695ffe946ca19b53720d4e92463a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 23:10:47 -0700
Subject: [PATCH 33/46] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/db4d4031b50d
Author: Marina <mri@tid.es>
Desc: Merge pull request #25131 from gitmai/bug-1080473-difference-between-byApp-and-global

Bug 1080473 - [Usage] Noticeable difference between by application break...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/facf167e6e37
Author: mai <mri@tid.es>
Desc: Bug 1080473 - [Usage] Noticeable difference between by application breakdown totals and the total displayed in chart and widget

========

https://hg.mozilla.org/integration/gaia-central/rev/81e4e4f83035
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #24930 from cctuan/1067231

Bug 1067231 - [Keyboard][Text Selection] Tapping the touch caret should show Paste utility bubble if clipboard is not empty

========

https://hg.mozilla.org/integration/gaia-central/rev/a605b824f250
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1082399  - [Keyboard][Text Selection] Tapping the touch caret should show Paste utility bubble if clipboard is not empty
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 1ad543226a7a..0c39f3d64c15 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "17b27134fb2a343703a2c2e0bf243932de4f1989", 
+    "revision": "db4d4031b50dff08d6a4f61f97ab2a598efb30bb", 
     "repo_path": "/integration/gaia-central"
 }

From 3f26b06406b562bc6dbd0dca73bdae36eee08fa8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 23:17:01 -0700
Subject: [PATCH 34/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index f3d3bd31db82..ed8a66639d95 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8badc3492ffd..bcf8a1a30189 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 0872339d6899..227107f0e971 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7ea86ff6035b..225e9f46c893 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8badc3492ffd..bcf8a1a30189 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 800974b0afa7..d4a4b20eb20d 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 6b13f02e43f6..aa8dd715083d 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index f8a37db1e54a..b6a64838e9ab 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index eaef732383b3..ad84028cadd4 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 9410def1f256..f6db04fd1e04 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 623e385a5cd5..9cd7431b7dd7 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6cbfaf9d652c249e1faf05d464c85525d5a38ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From f242e680d12c2fd36e83210f64abc7f524184976 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 23:25:48 -0700
Subject: [PATCH 35/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ba323456efdf
Author: Marina <mri@tid.es>
Desc: Merge pull request #25134 from empoalp/bug_1059715_4

Bug 1059715 - VCard reader refactor to read contacts before importing th...

========

https://hg.mozilla.org/integration/gaia-central/rev/4a40de3598fb
Author: David Garcia <davidg@tid.es>
Desc: Bug 1059715 - VCard reader refactor to read contacts before importing them r=sergi
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 0c39f3d64c15..a238875a775a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "db4d4031b50dff08d6a4f61f97ab2a598efb30bb", 
+    "revision": "ba323456efdf2afb3388d82b109102de5b69b612", 
     "repo_path": "/integration/gaia-central"
 }

From 17b5450c07cc57b2aeb8cadf72f1cb59bec2789b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 23:31:57 -0700
Subject: [PATCH 36/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index ed8a66639d95..7bbad1257345 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index bcf8a1a30189..955112d38eb8 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 227107f0e971..28802855d9a9 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 225e9f46c893..db6ef7e6e5cf 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index bcf8a1a30189..955112d38eb8 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index d4a4b20eb20d..eb357a9b4921 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index aa8dd715083d..e5cef0dfc704 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b6a64838e9ab..aba07f03c533 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index ad84028cadd4..77acf627f6e1 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f6db04fd1e04..3510846f9fd7 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 9cd7431b7dd7..d844f969e45e 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2059503549642b9d07d13b85c20a5b54801a202e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 84817115c61da9ac7caeb15c2dbd41268a0fc966 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 23:55:50 -0700
Subject: [PATCH 37/46] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/9730965fdf0e
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #25035 from ferjm/bug1053163.inappicon

Bug 1053163 - B2G emulator debug mochitests and Mulet reftests attempt t...

========

https://hg.mozilla.org/integration/gaia-central/rev/d64d875d7297
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 1053163 - B2G emulator debug mochitests and Mulet reftests attempt to connect to inapp-pay-test.paas.allizom.org. r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/069fa8b3e76d
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #25210 from gabrielesvelto/bug-1081028-cdma-call-onhold

Bug 1081028 - Do not try to hold a single call in CDMA mode since it's not supported r=drs

========

https://hg.mozilla.org/integration/gaia-central/rev/9cca4956c161
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1081028 - Do not try to hold a single call in CDMA mode since it's not supported r=drs

========

https://hg.mozilla.org/integration/gaia-central/rev/341ec79b7657
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #25180 from jmcanterafonseca/fix_scroll_2

Bug 1083100 - [Contacts] In the contacts selection screen horizontal scr...

========

https://hg.mozilla.org/integration/gaia-central/rev/1b9fabf074b0
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1083100 - [Contacts] In the contacts selection screen horizontal scrolling is enabled
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a238875a775a..55c939ff36f9 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "ba323456efdf2afb3388d82b109102de5b69b612", 
+    "revision": "9730965fdf0e6f68641bc9b835ab268d3b435873", 
     "repo_path": "/integration/gaia-central"
 }

From a67d200d00757983d3f5a6a2d6ce3f52fd03c39e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 16 Oct 2014 23:57:35 -0700
Subject: [PATCH 38/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 7bbad1257345..aad844587368 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 955112d38eb8..a28a33637783 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 28802855d9a9..476b5245a127 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index db6ef7e6e5cf..5576108bc38e 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 955112d38eb8..a28a33637783 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index eb357a9b4921..71ea6ef521d4 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index e5cef0dfc704..0e23f9552b2c 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index aba07f03c533..4627f3e8bbde 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 77acf627f6e1..85161619baeb 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 3510846f9fd7..de869cc0e9fc 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index d844f969e45e..0bb308e2ec6b 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="edde948b44c14b022bdc58540df33175e99d55e9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 2ce1258e62360b38e47af2ec049cc97986f29a85 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 17 Oct 2014 00:10:50 -0700
Subject: [PATCH 39/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/48560b945308
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #25136 from jmcanterafonseca/fix_search_position_2

Bug 1065731 - When adding a number to an existing contact, search icon d...

========

https://hg.mozilla.org/integration/gaia-central/rev/dec760b9aa98
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1065731 - When adding a number to an existing contact, search icon does nothing
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 55c939ff36f9..4ea26a3be9c2 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "9730965fdf0e6f68641bc9b835ab268d3b435873", 
+    "revision": "48560b9453082ec39a354afc0ca29f3060c42c52", 
     "repo_path": "/integration/gaia-central"
 }

From d69f951c333913129f47b4058e2235613180f0a1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 17 Oct 2014 00:17:03 -0700
Subject: [PATCH 40/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index aad844587368..6d4948568e09 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a28a33637783..f8764fa679e7 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 476b5245a127..5f27e56ad43f 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 5576108bc38e..16093b43e2e1 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a28a33637783..f8764fa679e7 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 71ea6ef521d4..1cc3a80d1d39 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 0e23f9552b2c..d26a2d2e58b3 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 4627f3e8bbde..bab73f365cdd 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 85161619baeb..f85b205ffc2b 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index de869cc0e9fc..7b738579a186 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 0bb308e2ec6b..1aaa1f9fbfff 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9c58445548bce2d610dd41829dcee24e553496ca"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From cfababa43a964bc665ad1296dd9ef50d1d753ae9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 17 Oct 2014 00:25:48 -0700
Subject: [PATCH 41/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/73ba4234231f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #25251 from empoalp/bug_1084225

Bug 1084225 - Missing image thumbnail dependency in VCardReader r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/eb75f3492da8
Author: David Garcia <davidg@tid.es>
Desc: Bug 1084225 - Missing image thumbnail dependency in VCardReader r=jmcf
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 4ea26a3be9c2..f008d5d09639 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "48560b9453082ec39a354afc0ca29f3060c42c52", 
+    "revision": "73ba4234231f12d55219bd2e932b6478a7ee5888", 
     "repo_path": "/integration/gaia-central"
 }

From 0879dce3f133367433474bb3ecae692d7f827c99 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 17 Oct 2014 00:31:56 -0700
Subject: [PATCH 42/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 6d4948568e09..6ae032e55929 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f8764fa679e7..a73170f6c6f1 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 5f27e56ad43f..51ada69b5ca5 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 16093b43e2e1..4e29e87253ad 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f8764fa679e7..a73170f6c6f1 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 1cc3a80d1d39..8c0c154b89f4 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d26a2d2e58b3..c25256467244 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index bab73f365cdd..6f2bb41cc5c3 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index f85b205ffc2b..fc359b18b7d5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 7b738579a186..2e67fc939535 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 1aaa1f9fbfff..fdc6d496755a 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0a56bca14e743a5d1b34808cbaffc171f845de60"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From e6f5550746cd31fd9c8f410ce95cc06a516c4e36 Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 17 Oct 2014 08:54:37 +0100
Subject: [PATCH 43/46] Bug 1076898 - Initial pass at Gridview visuals Initial
 pass at Gridview visuals (r=lucasr)

---
 .../drawable-hdpi/new_tablet_tab_close.png    | Bin 0 -> 341 bytes
 .../layout/new_tablet_tabs_item_cell.xml      |  59 ++++++++++++++++++
 .../base/resources/values-land/dimens.xml     |   1 +
 .../android/base/resources/values/dimens.xml  |   5 ++
 mobile/android/base/tabs/TabsGridLayout.java  |  17 ++++-
 .../android/base/tabs/TabsLayoutAdapter.java  |   6 +-
 mobile/android/base/tabs/TabsListLayout.java  |   2 +-
 7 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 mobile/android/base/resources/drawable-hdpi/new_tablet_tab_close.png
 create mode 100644 mobile/android/base/resources/layout/new_tablet_tabs_item_cell.xml

diff --git a/mobile/android/base/resources/drawable-hdpi/new_tablet_tab_close.png b/mobile/android/base/resources/drawable-hdpi/new_tablet_tab_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6135d6d53f470e82ed0621887d3d77817e10704
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQi&wyaXWE-{+CZU4o-U3d7N?h9G3+~JAkg}-eoaT4
zbB-&cs_6E_tp`#yb}$BISa4@*JQS*C7U(~wAS{!9qjcuXnr|ok-7a}tin<gNbYQ0n
ztEc_P`}&i&Ft%;1V<<~2d+ppHYS25sj=8|AD$U_ziX_VenFc9~sttTg7{7^0Yb9LF
zs*v2=a3!s5bINu<9*&u}gc&znySRIUBWGnZmxQVc_t%8T7K`8N-m$Iwd#3T`7AW+p
zr%z>GIhl7kXWNpyr@v00pfcg;g<0$$TedOnv*l=*8LOIWoE*nw@KHgNEhk#s;F&ys
fv})$hiW~3Rc5JU=esduV=vxL)S3j3^P6<r_@R)o~

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/layout/new_tablet_tabs_item_cell.xml b/mobile/android/base/resources/layout/new_tablet_tabs_item_cell.xml
new file mode 100644
index 000000000000..ed9b10a7fb19
--- /dev/null
+++ b/mobile/android/base/resources/layout/new_tablet_tabs_item_cell.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<org.mozilla.gecko.tabs.TabsLayoutItemView xmlns:android="http://schemas.android.com/apk/res/android"
+                                           style="@style/TabsItem"
+                                           android:focusable="true"
+                                           android:id="@+id/info"
+                                           android:layout_width="wrap_content"
+                                           android:layout_height="wrap_content"
+                                           android:paddingTop="6dip"
+                                           android:paddingBottom="6dip"
+                                           android:paddingLeft="1dip"
+                                           android:paddingRight="1dip"
+                                           android:gravity="center"
+                                           android:orientation="vertical">
+
+    <LinearLayout android:layout_width="@dimen/new_tablet_tab_thumbnail_width"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:padding="3dip">
+
+        <TextView android:id="@+id/title"
+                  android:layout_width="0dip"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1.0"
+                  android:paddingTop="4dip"
+                  style="@style/TabRowTextAppearance"
+                  android:textSize="12sp"
+                  android:textColor="#FFFFFFFF"
+                  android:singleLine="true"
+                  android:duplicateParentState="true"/>
+
+        <ImageButton android:id="@+id/close"
+                     style="@style/TabsItemClose"
+                     android:layout_width="wrap_content"
+                     android:layout_height="match_parent"
+                     android:background="@drawable/action_bar_button_inverse"
+                     android:scaleType="center"
+                     android:contentDescription="@string/close_tab"
+                     android:src="@drawable/new_tablet_tab_close"/>
+
+    </LinearLayout>
+
+    <RelativeLayout android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="3dp"
+                    android:background="@drawable/tab_thumbnail"
+                    android:duplicateParentState="true">
+
+        <org.mozilla.gecko.widget.ThumbnailView android:id="@+id/thumbnail"
+                                                android:layout_width="@dimen/new_tablet_tab_thumbnail_width"
+                                                android:layout_height="@dimen/new_tablet_tab_thumbnail_height"
+                                                android:src="@drawable/tab_thumbnail_default"/>
+
+    </RelativeLayout>
+
+</org.mozilla.gecko.tabs.TabsLayoutItemView>
diff --git a/mobile/android/base/resources/values-land/dimens.xml b/mobile/android/base/resources/values-land/dimens.xml
index 48f58edc4378..5d0d26192d66 100644
--- a/mobile/android/base/resources/values-land/dimens.xml
+++ b/mobile/android/base/resources/values-land/dimens.xml
@@ -8,4 +8,5 @@
     <!-- Remote Tabs static view top padding. Less in landscape on phones. -->
     <dimen name="home_remote_tabs_top_padding">16dp</dimen>
 
+    <dimen name="new_tablet_tab_panel_grid_padding">48dp</dimen>
 </resources>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index c0ab4f1030a6..985d23dfbd8f 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -118,6 +118,11 @@
     <dimen name="url_bar_offset_left">32dp</dimen>
     <dimen name="history_tab_indicator_height">50dp</dimen>
 
+
+    <dimen name="new_tablet_tab_thumbnail_height">180dp</dimen>
+    <dimen name="new_tablet_tab_thumbnail_width">180dp</dimen>
+    <dimen name="new_tablet_tab_panel_grid_padding">24dp</dimen>
+
     <!-- PageActionButtons dimensions -->
     <dimen name="page_action_button_width">32dp</dimen>
 
diff --git a/mobile/android/base/tabs/TabsGridLayout.java b/mobile/android/base/tabs/TabsGridLayout.java
index d93b09bcb68c..37835c065ccf 100644
--- a/mobile/android/base/tabs/TabsGridLayout.java
+++ b/mobile/android/base/tabs/TabsGridLayout.java
@@ -16,8 +16,11 @@ import org.mozilla.gecko.tabs.TabsPanel.TabsLayout;
 import org.mozilla.gecko.Tabs;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.GridView;
 import android.view.ViewGroup;
@@ -58,6 +61,18 @@ class TabsGridLayout extends GridView
                 item.setThumbnail(null);
             }
         });
+
+        setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
+        setStretchMode(GridView.STRETCH_SPACING);
+        setGravity(Gravity.CENTER);
+        setNumColumns(GridView.AUTO_FIT);
+
+        final Resources resources = getResources();
+        final int columnWidth = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_thumbnail_width);
+        setColumnWidth(columnWidth);
+
+        final int padding = resources.getDimensionPixelSize(R.dimen.new_tablet_tab_panel_grid_padding);
+        setPadding(padding, 0, padding, 0);
     }
 
     private class TabsGridLayoutAdapter extends TabsLayoutAdapter {
@@ -66,7 +81,7 @@ class TabsGridLayout extends GridView
         final private View.OnClickListener mSelectClickListener;
 
         public TabsGridLayoutAdapter (Context context) {
-            super(context);
+            super(context, R.layout.new_tablet_tabs_item_cell);
 
             mCloseClickListener = new Button.OnClickListener() {
                 @Override
diff --git a/mobile/android/base/tabs/TabsLayoutAdapter.java b/mobile/android/base/tabs/TabsLayoutAdapter.java
index 8e21e8e67e6c..549e937e3a5b 100644
--- a/mobile/android/base/tabs/TabsLayoutAdapter.java
+++ b/mobile/android/base/tabs/TabsLayoutAdapter.java
@@ -21,12 +21,14 @@ public class TabsLayoutAdapter extends BaseAdapter {
     public static final String LOGTAG = "Gecko" + TabsLayoutAdapter.class.getSimpleName();
 
     private final Context mContext;
+    private final int mTabLayoutId;
     private ArrayList<Tab> mTabs;
     private final LayoutInflater mInflater;
 
-    public TabsLayoutAdapter (Context context) {
+    public TabsLayoutAdapter (Context context, int tabLayoutId) {
         mContext = context;
         mInflater = LayoutInflater.from(mContext);
+        mTabLayoutId = tabLayoutId;
     }
 
     final void setTabs (ArrayList<Tab> tabs) {
@@ -83,7 +85,7 @@ public class TabsLayoutAdapter extends BaseAdapter {
     }
 
     TabsLayoutItemView newView(int position, ViewGroup parent) {
-        return (TabsLayoutItemView) mInflater.inflate(R.layout.tabs_layout_item_view, parent, false);
+        return (TabsLayoutItemView) mInflater.inflate(mTabLayoutId, parent, false);
     }
 
     void bindView(TabsLayoutItemView view, Tab tab) {
diff --git a/mobile/android/base/tabs/TabsListLayout.java b/mobile/android/base/tabs/TabsListLayout.java
index 894e530378e5..326b6c41eb9d 100644
--- a/mobile/android/base/tabs/TabsListLayout.java
+++ b/mobile/android/base/tabs/TabsListLayout.java
@@ -89,7 +89,7 @@ class TabsListLayout extends TwoWayView
     private class TabsListLayoutAdapter extends TabsLayoutAdapter {
         private final Button.OnClickListener mCloseOnClickListener;
         public TabsListLayoutAdapter (Context context) {
-            super(context);
+            super(context, R.layout.tabs_layout_item_view);
 
             mCloseOnClickListener = new Button.OnClickListener() {
                 @Override

From 90d84f91ee1988d894335012cdfd2bcbd1de5bf7 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 17 Oct 2014 09:58:52 +0200
Subject: [PATCH 44/46] Backed out changeset d38f7ebb2192 (bug 1054959) for m1
 test failures

---
 browser/base/content/browser-context.inc      |   5 -
 browser/base/content/browser.js               |   6 -
 browser/base/content/nsContextMenu.js         |  29 ----
 .../test/general/test_contextmenu.html        |   3 +-
 browser/components/nsBrowserGlue.js           |  25 ---
 .../locales/en-US/chrome/browser/browser.dtd  |   2 -
 browser/modules/CastingApps.jsm               | 160 ------------------
 browser/modules/moz.build                     |   1 -
 .../secondscreen/SimpleServiceDiscovery.jsm   |   4 +-
 9 files changed, 2 insertions(+), 233 deletions(-)
 delete mode 100644 browser/modules/CastingApps.jsm

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 44fb0cf3ef0f..e8a58892b3b1 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -240,11 +240,6 @@
                 label="&emailVideoCmd.label;"
                 accesskey="&emailVideoCmd.accesskey;"
                 oncommand="gContextMenu.sendMedia();"/>
-      <menu id="context-castvideo"
-                label="&castVideoCmd.label;"
-                accesskey="&castVideoCmd.accesskey;">
-        <menupopup id="context-castvideo-popup" onpopupshowing="gContextMenu.populateCastVideoMenu(this)"/>
-      </menu>
       <menuitem id="context-sendaudio"
                 label="&emailAudioCmd.label;"
                 accesskey="&emailAudioCmd.accesskey;"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d114ae9a4b5a..e5574c86add1 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -188,12 +188,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormValidationHandler",
 XPCOMUtils.defineLazyModuleGetter(this, "UITour",
   "resource:///modules/UITour.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "CastingApps",
-  "resource:///modules/CastingApps.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
-  "resource://gre/modules/SimpleServiceDiscovery.jsm");
-
 let gInitialPages = [
   "about:blank",
   "about:newtab",
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 25d237618ab1..f73c2bb1cd40 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -208,19 +208,9 @@ nsContextMenu.prototype = {
     // Send media URL (but not for canvas, since it's a big data: URL)
     this.showItem("context-sendimage", this.onImage);
     this.showItem("context-sendvideo", this.onVideo);
-    this.showItem("context-castvideo", this.onVideo);
     this.showItem("context-sendaudio", this.onAudio);
     this.setItemAttr("context-sendvideo", "disabled", !this.mediaURL);
     this.setItemAttr("context-sendaudio", "disabled", !this.mediaURL);
-    // getServicesForVideo alone would be sufficient here (it depends on
-    // SimpleServiceDiscovery.services), but SimpleServiceDiscovery is garanteed
-    // to be already loaded, since we load it on startup, and CastingApps isn't,
-    // so check SimpleServiceDiscovery.services first to avoid needing to load
-    // CastingApps.jsm if we don't need to.
-    let shouldShowCast = this.mediaURL &&
-                         SimpleServiceDiscovery.services.length > 0 &&
-                         CastingApps.getServicesForVideo(this.target).length > 0;
-    this.setItemAttr("context-castvideo", "disabled", !shouldShowCast);
   },
 
   initViewItems: function CM_initViewItems() {
@@ -1326,25 +1316,6 @@ nsContextMenu.prototype = {
     MailIntegration.sendMessage(this.mediaURL, "");
   },
 
-  castVideo: function() {
-    CastingApps.openExternal(this.target, window);
-  },
-
-  populateCastVideoMenu: function(popup) {
-    let videoEl = this.target;
-    popup.innerHTML = null;
-    let doc = popup.ownerDocument;
-    let services = CastingApps.getServicesForVideo(videoEl);
-    services.forEach(service => {
-      let item = doc.createElement("menuitem");
-      item.setAttribute("label", service.friendlyName);
-      item.addEventListener("command", event => {
-        CastingApps.sendVideoToService(videoEl, service);
-      });
-      popup.appendChild(item);
-    });
-  },
-
   playPlugin: function() {
     gPluginHandler.contextMenuCommand(this.browser, this.target, "play");
   },
diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index 856494036637..20c86b4534a7 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -174,8 +174,7 @@ function runTest(testNum) {
                           "---",                        null,
                           "context-savevideo",          true,
                           "context-video-saveimage",    true,
-                          "context-sendvideo",          true,
-                          "context-castvideo",          false
+                          "context-sendvideo",          true
                          ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(audio_in_video); // Invoke context menu for next test.
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 5acb094f716e..abd2504a910e 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -99,9 +99,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
 XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
                                   "resource://gre/modules/LoginManagerParent.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
-                                  "resource://gre/modules/SimpleServiceDiscovery.jsm");
-
 #ifdef NIGHTLY_BUILD
 XPCOMUtils.defineLazyModuleGetter(this, "SignInToWebsiteUX",
                                   "resource:///modules/SignInToWebsite.jsm");
@@ -750,30 +747,8 @@ BrowserGlue.prototype = {
     FormValidationHandler.uninit();
   },
 
-  _initServiceDiscovery: function () {
-    var rokuDevice = {
-      id: "roku:ecp",
-      target: "roku:ecp",
-      factory: function(aService) {
-        Cu.import("resource://gre/modules/RokuApp.jsm");
-        return new RokuApp(aService);
-      },
-      mirror: false,
-      types: ["video/mp4"],
-      extensions: ["mp4"]
-    };
-
-    // Register targets
-    SimpleServiceDiscovery.registerDevice(rokuDevice);
-
-    // Search for devices continuously every 120 seconds
-    SimpleServiceDiscovery.search(120 * 1000);
-  },
-
   // All initial windows have opened.
   _onWindowsRestored: function BG__onWindowsRestored() {
-    this._initServiceDiscovery();
-
     // Show update notification, if needed.
     if (Services.prefs.prefHasUserValue("app.update.postupdate"))
       this._showUpdateNotification();
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index e84a5512a5c9..29f515d814c0 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -484,8 +484,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY emailImageCmd.accesskey      "g">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
-<!ENTITY castVideoCmd.label           "Send Video To Device">
-<!ENTITY castVideoCmd.accesskey       "d">
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
diff --git a/browser/modules/CastingApps.jsm b/browser/modules/CastingApps.jsm
deleted file mode 100644
index df974f04f606..000000000000
--- a/browser/modules/CastingApps.jsm
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- Mode: js; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
-/* 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/. */
-"use strict";
-this.EXPORTED_SYMBOLS = ["CastingApps"];
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
-
-
-var CastingApps = {
-  _sendEventToVideo: function (element, data) {
-    let event = element.ownerDocument.createEvent("CustomEvent");
-    event.initCustomEvent("media-videoCasting", false, true, JSON.stringify(data));
-    element.dispatchEvent(event);
-  },
-
-  makeURI: function (url, charset, baseURI) {
-    return Services.io.newURI(url, charset, baseURI);
-  },
-
-  getVideo: function (element) {
-    if (!element) {
-      return null;
-    }
-
-    let extensions = SimpleServiceDiscovery.getSupportedExtensions();
-    let types = SimpleServiceDiscovery.getSupportedMimeTypes();
-
-    // Grab the poster attribute from the <video>
-    let posterURL = element.poster;
-
-    // First, look to see if the <video> has a src attribute
-    let sourceURL = element.src;
-
-    // If empty, try the currentSrc
-    if (!sourceURL) {
-      sourceURL = element.currentSrc;
-    }
-
-    if (sourceURL) {
-      // Use the file extension to guess the mime type
-      let sourceURI = this.makeURI(sourceURL, null, this.makeURI(element.baseURI));
-      if (this.allowableExtension(sourceURI, extensions)) {
-        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI};
-      }
-    }
-
-    // Next, look to see if there is a <source> child element that meets
-    // our needs
-    let sourceNodes = element.getElementsByTagName("source");
-    for (let sourceNode of sourceNodes) {
-      let sourceURI = this.makeURI(sourceNode.src, null, this.makeURI(sourceNode.baseURI));
-
-      // Using the type attribute is our ideal way to guess the mime type. Otherwise,
-      // fallback to using the file extension to guess the mime type
-      if (this.allowableMimeType(sourceNode.type, types) || this.allowableExtension(sourceURI, extensions)) {
-        return { element: element, source: sourceURI.spec, poster: posterURL, sourceURI: sourceURI, type: sourceNode.type };
-      }
-    }
-
-    return null;
-  },
-
-  sendVideoToService: function (videoElement, service) {
-    if (!service)
-      return;
-
-    let video = this.getVideo(videoElement);
-    if (!video) {
-      return;
-    }
-
-    // Make sure we have a player app for the given service
-    let app = SimpleServiceDiscovery.findAppForService(service);
-    if (!app)
-      return;
-
-    video.title = videoElement.ownerDocument.defaultView.top.document.title;
-    if (video.element) {
-      // If the video is currently playing on the device, pause it
-      if (!video.element.paused) {
-        video.element.pause();
-      }
-    }
-
-    app.stop(() => {
-      app.start(started => {
-        if (!started) {
-          Cu.reportError("CastingApps: Unable to start app");
-          return;
-        }
-
-        app.remoteMedia(remoteMedia => {
-          if (!remoteMedia) {
-            Cu.reportError("CastingApps: Failed to create remotemedia");
-            return;
-          }
-
-          this.session = {
-            service: service,
-            app: app,
-            remoteMedia: remoteMedia,
-            data: {
-              title: video.title,
-              source: video.source,
-              poster: video.poster
-            },
-            videoRef: Cu.getWeakReference(video.element)
-          };
-        }, this);
-      });
-    });
-  },
-
-  getServicesForVideo: function (videoElement) {
-    let video = this.getVideo(videoElement);
-    if (!video) {
-      return {};
-    }
-
-    let filteredServices = SimpleServiceDiscovery.services.filter(service => {
-      return this.allowableExtension(video.sourceURI, service.extensions) ||
-             this.allowableMimeType(video.type, service.types);
-    });
-
-    return filteredServices;
-  },
-
-  // RemoteMedia callback API methods
-  onRemoteMediaStart: function (remoteMedia) {
-    if (!this.session) {
-      return;
-    }
-
-    remoteMedia.load(this.session.data);
-
-    let video = this.session.videoRef.get();
-    if (video) {
-      this._sendEventToVideo(video, { active: true });
-    }
-  },
-
-  onRemoteMediaStop: function (remoteMedia) {
-  },
-
-  onRemoteMediaStatus: function (remoteMedia) {
-  },
-
-  allowableExtension: function (uri, extensions) {
-    return (uri instanceof Ci.nsIURL) && extensions.indexOf(uri.fileExtension) != -1;
-  },
-
-  allowableMimeType: function (type, types) {
-    return types.indexOf(type) != -1;
-  }
-};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 06d5d7404174..602edae252ea 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -14,7 +14,6 @@ XPCSHELL_TESTS_MANIFESTS += [
 EXTRA_JS_MODULES += [
     'BrowserNewTabPreloader.jsm',
     'BrowserUITelemetry.jsm',
-    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
diff --git a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
index bca051562580..c06cbfaaf189 100644
--- a/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
+++ b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
@@ -135,9 +135,7 @@ var SimpleServiceDiscovery = {
 
   _usingLAN: function() {
     let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
-    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI ||
-            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET ||
-            network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_UNKNOWN);
+    return (network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_WIFI || network.linkType == Ci.nsINetworkLinkService.LINK_TYPE_ETHERNET);
   },
 
   _search: function _search() {

From 29b2e5957fd9c8860b19d02081f3c5730d567660 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 17 Oct 2014 01:30:49 -0700
Subject: [PATCH 45/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/934b8c3014a3
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #25058 from timdream/screen-wake-lock-manager

Bug 1081630 - Implement WakeLockManagers, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/3de3252d9d42
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1081630 - Implement WakeLockManagers
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index f008d5d09639..9664093845cd 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "73ba4234231f12d55219bd2e932b6478a7ee5888", 
+    "revision": "934b8c3014a3e20dd5d90ecf95f4b6b704dddb1e", 
     "repo_path": "/integration/gaia-central"
 }

From f4375ef57527a11b3e95f17d9aa41e2f40f09ef3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 17 Oct 2014 01:32:35 -0700
Subject: [PATCH 46/46] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 6ae032e55929..b9d2bf969efb 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a73170f6c6f1..d9197012c578 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 51ada69b5ca5..9a6c7d319bf9 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 4e29e87253ad..84684c1215e0 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a73170f6c6f1..d9197012c578 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 8c0c154b89f4..d55ce8f7482e 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3a2947df41a480de1457a6dcdbf46ad0af70d8e0">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index c25256467244..52ca484c87ae 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 6f2bb41cc5c3..423b426b54a5 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index fc359b18b7d5..6eb79edcafc1 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 2e67fc939535..ae02f80fd648 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="9f6b7471c881ee689183d681658cf2ba3dfc5610"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index fdc6d496755a..70ac3ec41131 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5d9cf92d845954073ebe37cbed74a77f942e3361"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1daf2dadcd0d554c733661a4c0be1b82001e9da0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="cc1f362ce43dce92ac786187ff4abf39060094bd"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>