Commit a65e4225 authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge mozilla-inbound to mozilla-central a=merge

parents 8e7d5fea ff16d58a

browser/base/content/browser.xul

+2 −2
Original line number Diff line number Diff line
@@ -259,12 +259,12 @@ 
           onpopuphidden="SocialShare.onHidden()"

           hidden="true">

      <hbox class="social-share-toolbar">

        <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button"

        <toolbarbutton id="manage-share-providers" class="share-provider-button"

                       tooltiptext="&social.addons.label;"

                       oncommand="BrowserOpenAddonsMgr('addons://list/service');

                                  this.parentNode.parentNode.hidePopup();"/>

        <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">

          <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"

          <toolbarbutton id="add-share-provider" class="share-provider-button" type="radio"

                         group="share-providers" tooltiptext="&findShareServices.label;"

                         oncommand="SocialShare.showDirectory()"/>

        </arrowscrollbox>

browser/base/content/test/general/browser_mcb_redirect.js

+8 −6
Original line number Diff line number Diff line
@@ -303,10 +303,12 @@ function test() { 
  Services.prefs.setBoolPref(PREF_ACTIVE, true);

  Services.prefs.setBoolPref(PREF_DISPLAY, true);



  pushPrefs(["dom.ipc.processCount", 1]).then(() => {

    var newTab = gBrowser.addTab();

    gBrowser.selectedTab = newTab;

    gTestBrowser = gBrowser.selectedBrowser;

    newTab.linkedBrowser.stop();



    executeSoon(test1);

  });

}

browser/components/sessionstore/test/browser_350525.js

+6 −0
Original line number Diff line number Diff line 
"use strict";



add_task(function* setup() {

  yield SpecialPowers.pushPrefEnv({

    set: [["dom.ipc.processCount", 1]]

  });

})



add_task(function* () {

  /** Test for Bug 350525 **/

browser/components/sessionstore/test/browser_354894_perwindowpb.js

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ add_task(function* setup() { 


  // This test takes some time to run, and it could timeout randomly.

  // So we require a longer timeout. See bug 528219.

  requestLongerTimeout(2);

  requestLongerTimeout(3);



  // Make the main test window not count as a browser window any longer

  let oldWinType = document.documentElement.getAttribute("windowtype");

browser/extensions/e10srollout/bootstrap.js

+32 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ function defineCohort() { 
  let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0);

  let testGroup = (getUserSample() < TEST_THRESHOLD[updateChannel]);

  let hasNonExemptAddon = Preferences.get(PREF_E10S_HAS_NONEXEMPT_ADDON, false);

  let temporaryDisqualification = getTemporaryDisqualification();



  let cohortPrefix = "";

  if (disqualified) {
@@ -93,6 +94,17 @@ function defineCohort() { 
    setCohort("optedOut");

  } else if (userOptedIn) {

    setCohort("optedIn");

  } else if (temporaryDisqualification != "") {

    // Users who are disqualified by the backend (from multiprocessBlockPolicy)

    // can be put into either the test or control groups, because e10s will

    // still be denied by the backend, which is useful so that the E10S_STATUS

    // telemetry probe can be correctly set.



    // For these volatile disqualification reasons, however, we must not try

    // to activate e10s because the backend doesn't know about it. E10S_STATUS

    // here will be accumulated as "2 - Disabled", which is fine too.

    setCohort(`temp-disqualified-${temporaryDisqualification}`);

    Preferences.reset(PREF_TOGGLE_E10S);

  } else if (testGroup) {

    setCohort(`${cohortPrefix}test`);

    Preferences.set(PREF_TOGGLE_E10S, true);
@@ -150,3 +162,23 @@ function optedOut() { 
         (Preferences.isSet(PREF_TOGGLE_E10S) &&

          Preferences.get(PREF_TOGGLE_E10S) == false);

}



/* If this function returns a non-empty string, it

 * means that this particular user should be temporarily

 * disqualified due to some particular reason.

 * If a user shouldn't be disqualified, then an empty

 * string must be returned.

 */

function getTemporaryDisqualification() {

  let applicationLanguage =

    Cc["@mozilla.org/chrome/chrome-registry;1"]

      .getService(Ci.nsIXULChromeRegistry)

      .getSelectedLocale("global")

      .split("-")[0];



  if (applicationLanguage == "ru") {

    return "ru";

  }



  return "";

}