Commit e141e24f authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge m-c to autoland, a=merge 

MozReview-Commit-ID: 1peTFbNMVnU
parents a3a59ddf ad7e3a0c

browser/base/content/test/general/browser.ini

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ skip-if = os == "linux" # Bug 924307 
tags = audiochannel

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_backButtonFitts.js]

skip-if = os == "mac" # The Fitt's Law back button is not supported on OS X

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_beforeunload_duplicate_dialogs.js]

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

browser/base/content/test/static/browser_all_files_referenced.js

+0 −2
Original line number Diff line number Diff line
@@ -239,8 +239,6 @@ var whitelist = new Set([ 
  {file: "resource://gre/modules/Profiler.jsm"},

  // Bug 1351658

  {file: "resource://gre/modules/PropertyListUtils.jsm", platforms: ["linux", "win"]},

  // Bug 1351093

  {file: "resource://gre/modules/Sntp.jsm"},

  // Bug 1351097

  {file: "resource://gre/modules/accessibility/AccessFu.jsm"},

  // Bug 1351637

browser/components/search/test/browser.ini

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ skip-if = artifact # bug 1315953 
[browser_oneOffContextMenu.js]

[browser_oneOffContextMenu_setDefault.js]

[browser_oneOffHeader.js]

skip-if = os == "mac" # bug 1361276

[browser_private_search_perwindowpb.js]

[browser_yahoo.js]

[browser_yahoo_behavior.js]

browser/components/sessionstore/SessionStore.jsm

+3 −0
Original line number Diff line number Diff line
@@ -615,6 +615,9 @@ var SessionStoreInternal = { 


    this._initPrefs();

    this._initialized = true;



    Telemetry.getHistogramById("FX_SESSION_RESTORE_PRIVACY_LEVEL").add(

      Services.prefs.getIntPref("browser.sessionstore.privacy_level"));

  },



  /**

browser/extensions/pocket/skin/osx/pocket.css

+2 −3
Original line number Diff line number Diff line 
@import url("chrome://pocket-shared/skin/pocket.css");



#pocket-button[cui-areatype="toolbar"] > .toolbarbutton-icon {

  max-width: 18px;

  margin: 0;

#nav-bar #pocket-button > .toolbarbutton-icon {

  padding: calc(var(--toolbarbutton-vertical-inner-padding)) 6px;

}



#pocket-button[cui-areatype="toolbar"][open] {