No bug - Fix merge bustage. CLOSED TREE
Merge m-c to fx-team on a CLOSED TREE.
Bug 918053 - TA__discoverSources should use Debugger.Source; r=past
Bug 935220: Uplift Add-on SDK to Firefox. r=me

https://github.com/mozilla/addon-sdk/compare/firefox27...50697e6182cb4f79f9605b7cd1d1f5084cfaf03f

--HG--
rename : addon-sdk/source/data/index.html => addon-sdk/source/test/addons/addon-page/data/index.html
rename : addon-sdk/source/test/favicon-helpers.js => addon-sdk/source/test/addons/places/favicon-helpers.js
rename : addon-sdk/source/test/places-helper.js => addon-sdk/source/test/addons/places/places-helper.js
rename : addon-sdk/source/data/test-trusted-document.html => addon-sdk/source/test/addons/symbiont/data/test-trusted-document.html
rename : addon-sdk/source/data/index.html => addon-sdk/source/test/fixtures/index.html
rename : addon-sdk/source/data/mofo_logo.SVG => addon-sdk/source/test/fixtures/mofo_logo.SVG
rename : addon-sdk/source/data/moz_favicon.ico => addon-sdk/source/test/fixtures/moz_favicon.ico
rename : addon-sdk/source/data/pagemod-css-include-file.css => addon-sdk/source/test/fixtures/pagemod-css-include-file.css
rename : addon-sdk/source/data/test-content-symbiont.js => addon-sdk/source/test/fixtures/test-content-symbiont.js
rename : addon-sdk/source/data/test-context-menu.js => addon-sdk/source/test/fixtures/test-context-menu.js
rename : addon-sdk/source/data/test-iframe-postmessage.html => addon-sdk/source/test/fixtures/test-iframe-postmessage.html
rename : addon-sdk/source/data/test-iframe.html => addon-sdk/source/test/fixtures/test-iframe.html
rename : addon-sdk/source/data/test-iframe.js => addon-sdk/source/test/fixtures/test-iframe.js
rename : addon-sdk/source/data/test-message-manager.js => addon-sdk/source/test/fixtures/test-message-manager.js
rename : addon-sdk/source/data/test-net-url.txt => addon-sdk/source/test/fixtures/test-net-url.txt
rename : addon-sdk/source/data/test-page-mod.html => addon-sdk/source/test/fixtures/test-page-mod.html
rename : addon-sdk/source/data/test-page-worker.html => addon-sdk/source/test/fixtures/test-page-worker.html
rename : addon-sdk/source/data/test-page-worker.js => addon-sdk/source/test/fixtures/test-page-worker.js
rename : addon-sdk/source/data/test-sidebar-addon-global.html => addon-sdk/source/test/fixtures/test-sidebar-addon-global.html
rename : addon-sdk/source/data/test-trusted-document.html => addon-sdk/source/test/fixtures/test-trusted-document.html
rename : addon-sdk/source/data/test.html => addon-sdk/source/test/fixtures/test.html
rename : addon-sdk/source/data/testLocalXhr.json => addon-sdk/source/test/fixtures/testLocalXhr.json
Bug 906839 - enable by default social.allowMultipleWorkers - update tests to work pref'd on and fix a missing update to the worker state, r=markh.
Bug 906839 - test fixes.  r=markh
Bug 906839 - disable one social test due to bug 919878. r=gavin
Bug 906839 - disable frameworker tests on ASAN builds, r=markh.
Bug 934774 - Intermittent exception is killing mochitests (primarily browser_pluginnotification.js) because we're dispatching an event to a document which is already dead. Check it's aliveness before dispatching, r=johns

--HG--
extra : rebase_source : b12ee9219793da46ebec5b1a770f3a1d80ea4c66
Bug 934503 - Activated hidden plugins should not show the hidden plugin notification icon, r=jaws

--HG--
extra : rebase_source : bdae17aa44e5fbe60d724b3ad98f679da9c851f1
Bug 934233 - Use nsLayoutUtils::FindContentFor instead of nsDOMWindowUtils::FindElementWithViewId. r=jimm