Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
484,763 Commits 615 Branches 98 Tags 5.9 GiB
b5f9f1309f
Commit Graph

35250 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
df7cfe1582 Backed out changeset 08a557e99638 (bug 1113581) for breaking bc4 tests 2016-07-29 17:05:29 +02:00
Fischer.json
d2ad89d1b9 Bug 1113581 - Artifact when editing a keyword, the keyword is displayed under the text-area. r=jaws 
MozReview-Commit-ID: 6toSvZlJeBz

--HG--
extra : transplant_source : %A8%CDuq%7C0%8C%0B%9F%23x5f%E0%24%24%D7o%D9%FA
 2016-07-21 17:33:40 +08:00
Dimi Lee
42ae8daefb Bug 1289028 - Retry when url-classifier test_gethash.html hits an exception. r=francois 
MozReview-Commit-ID: 9BR7RfAthcU

--HG--
extra : transplant_source : %D8%E0%D5%F5D4%E6%CC%04%7D%01%EA%87%BE%A4%F8%17%D2%3B%A3
 2016-07-29 08:21:01 +08:00
Carsten "Tomcat" Book
8c47612fee merge mozilla-inbound to mozilla-central a=merge 2016-07-29 11:56:43 +02:00
Carsten "Tomcat" Book
e7165f9b1e merge fx-team to mozilla-central a=merge 2016-07-29 11:55:36 +02:00
Mark Hammond
27fa2ce0b7 Bug 1275139 (part 3) - don't Sync system addons, nor apply them when incoming. r=rhelmer 
MozReview-Commit-ID: Jn0TNLy4cDJ
 2016-07-29 10:44:20 +10:00
Wes Kocher
2e8a001926 Merge m-c to fx-team, a=merge 2016-07-28 17:04:33 -07:00
Kris Maglione
bd7e3664e4 Bug 1276390 - Use blocking polling in worker to handle subprocess IO. r=aswan 
MozReview-Commit-ID: KXqgCLnO7dR

--HG--
extra : source : 48cff1c9b619bb224dd763332836522fd60c160f
extra : histedit_source : dd214d7b0835a3dcf361b9a6f65625fa2434cd81%2Cd7c9dc53cb4e020a66d716ec538e2f7c7664e91c
 2016-07-28 16:27:25 -07:00
Wes Kocher
97868e2577 Merge m-c to inbound, a=merge 2016-07-28 17:04:59 -07:00
Mike de Boer
0fb50c0670 Bug 1281171 - implement a debug mode for the finder highlighter. r=jaws 
MozReview-Commit-ID: Ay0yNw94qsS

--HG--
extra : rebase_source : dd309f036e370c2850389bf8eed1c49317197c6b
 2016-07-28 17:53:20 +02:00
Carsten "Tomcat" Book
37be51f16a merge mozilla-inbound to mozilla-central a=merge 2016-07-28 17:43:03 +02:00
Wes Kocher
98a30f1426 Backed out changeset 48cff1c9b619 (bug 1276390) for xpcshell bustage CLOSED TREE 2016-07-28 16:03:23 -07:00
Mike de Boer
aad7a3f94c Bug 1281421 - followup - fix ESLint error, even though the syntax was correct. r=me 
MozReview-Commit-ID: GXEEeuoqlxt
 2016-07-28 13:15:09 +02:00
Mike de Boer
ab362b9a3a Bug 1281421 - add new test to cover the new FinderIterator module code. r=jaws 
MozReview-Commit-ID: HZHdjyqFiYq

--HG--
extra : rebase_source : 61f320059e6296e3752c27b07e885d27db83ea7f
 2016-07-28 12:34:17 +02:00
Mike de Boer
ebb878b7df Bug 1281421 - adjust tests a bit to work with the new FindIterator. r=jaws 
MozReview-Commit-ID: 2teBOPPHgl

--HG--
extra : rebase_source : e232b0771aaf281c02c57105ff46f05186c632db
 2016-07-28 12:34:15 +02:00
Mike de Boer
33aa207132 Bug 1281421 - Merge the find counter and highlighter iterators into a FinderIterator singleton. r=jaws 
MozReview-Commit-ID: 9fhOKWIkOXN

--HG--
extra : rebase_source : 7a2bc23383b99b0a13ef49121f168bd03399b4a9
 2016-07-28 12:34:13 +02:00
Gerald Squelart
d3a3da966b Bug 1289668 - Inter-keyframe telemetry histograms - r=francois,kamidphish 
r?francois for telemetry-peer feedback through mozreview.

The goal of this telemetry is to gather statistics about inter-keyframe timings
of played videos, so we have a better understanding of typical values in the
field.
This inter-keyframe time is important for the background-suspend functionality,
as it will impact the recovery time (i.e., when moving a video back to the
foreground, what is the average & max time to the next random-access point?)

MozReview-Commit-ID: NISIf1wGtU

--HG--
extra : rebase_source : 34eb0bc852d4ae05701c56e38b3b0dc9c75d708e
 2016-07-28 10:16:17 +10:00
Sebastian Hengst
144e52be37 Backed out changeset 26f41a685662 (bug 1286746) for failing test_ext_runtime_connect_twoway.html and test_ext_storage_content.html on Android. r=backout 2016-07-28 10:34:56 +02:00
Sebastian Hengst
566ed8c855 Backed out changeset 562910144a3a (bug 1286746) 2016-07-28 10:34:56 +02:00
Sebastian Hengst
b18a29d071 Backed out changeset 8da1ed0adf15 (bug 1288885) for failure and crashes in test_ext_background_window_properties.js on Android in xpcshell and sets tests. r=backout 2016-07-28 10:06:35 +02:00
Sebastian Hengst
daa9f90512 Backed out changeset 2a6b728f8313 (bug 1288885) 
--HG--
rename : toolkit/components/extensions/test/xpcshell/test_ext_alarms.js => toolkit/components/extensions/test/mochitest/test_ext_alarms.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
01d39a3d35 Backed out changeset f9fd137c9691 (bug 1288885) 
--HG--
rename : toolkit/components/extensions/test/xpcshell/test_ext_background_runtime_connect_params.js => toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_extension.js => toolkit/components/extensions/test/mochitest/test_ext_extension.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_idle.js => toolkit/components/extensions/test/mochitest/test_ext_idle.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_onmessage_removelistener.js => toolkit/components/extensions/test/mochitest/test_ext_onmessage_removelistener.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js => toolkit/components/extensions/test/mochitest/test_ext_runtime_connect_no_receiver.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js => toolkit/components/extensions/test/mochitest/test_ext_runtime_getPlatformInfo.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage.js => toolkit/components/extensions/test/mochitest/test_ext_runtime_sendMessage.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js => toolkit/components/extensions/test/mochitest/test_ext_runtime_sendMessage_no_receiver.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_simple.js => toolkit/components/extensions/test/mochitest/test_ext_simple.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
33d9d68712 Backed out changeset 8f9b35334718 (bug 1288885) 
--HG--
rename : toolkit/components/extensions/test/xpcshell/test_ext_localStorage.js => toolkit/components/extensions/test/mochitest/test_ext_localStorage.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
8cf6309948 Backed out changeset 8c67ff2971ec (bug 1288885) 
--HG--
rename : browser/components/extensions/test/xpcshell/test_ext_bookmarks.js => toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
6b1348baf3 Backed out changeset d520f1245f5c (bug 1288885) 
--HG--
rename : toolkit/components/extensions/test/xpcshell/test_ext_storage.js => toolkit/components/extensions/test/mochitest/test_ext_storage.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
41ab1152be Backed out changeset abd51b3d2b52 (bug 1288885) 
--HG--
rename : toolkit/components/extensions/test/xpcshell/data/file_download.html => toolkit/components/extensions/test/mochitest/file_download.html
rename : toolkit/components/extensions/test/xpcshell/data/file_download.txt => toolkit/components/extensions/test/mochitest/file_download.txt
rename : toolkit/components/extensions/test/xpcshell/test_ext_downloads_download.js => toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_download.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js => toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_misc.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_downloads_search.js => toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_search.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_downloads.js => toolkit/components/extensions/test/mochitest/test_ext_downloads.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
b864225bf1 Backed out changeset fca556472346 (bug 1288885) 
--HG--
rename : toolkit/components/extensions/test/xpcshell/test_ext_background_generated_load_events.js => toolkit/components/extensions/test/mochitest/test_ext_background_generated_load_events.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_background_generated_reload.js => toolkit/components/extensions/test/mochitest/test_ext_background_generated_reload.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_background_sub_windows.js => toolkit/components/extensions/test/mochitest/test_ext_background_sub_windows.html
rename : toolkit/components/extensions/test/xpcshell/test_ext_background_window_properties.js => toolkit/components/extensions/test/mochitest/test_ext_background_window_properties.html
 2016-07-28 10:06:34 +02:00
Sebastian Hengst
00836683c4 Backed out changeset 43cf27f0e2ed (bug 1288885) 2016-07-28 10:06:33 +02:00
Kris Maglione
cd2ef08297 Bug 1274871: Return a more useful error message for executeScript without matching window. r=aswan 
MozReview-Commit-ID: 3AhuxY6gQPL

--HG--
extra : rebase_source : 35323eefade3ebd254cfe5bcf0f21ce0cc26ffdb
extra : amend_source : 93e150dce3dd0f467d38b630cd517452c12683a8
 2016-07-26 17:55:58 -07:00
Carsten "Tomcat" Book
1e0260eddf Merge mozilla-central to fx-team 2016-07-28 17:44:58 +02:00
Marco Bonardo
dc56c93a8c Bug 1287428 - Fix expiration of the FX_SANITIZE_ probes expiring in v50.r=adw 
MozReview-Commit-ID: IckqRR0RBbd

--HG--
extra : rebase_source : 401f807dcfa94460547e660a3f0ea7dbfb9d4026
extra : amend_source : ea0c1c6f3145a944a5e1966f325b7262a0246acf
 2016-07-26 17:27:17 +02:00
Carsten "Tomcat" Book
cc81a5ecb3 Backed out changeset ad4e4ea6550a (bug 1166947) for failing on own test 2016-07-28 14:36:57 +02:00
Matthew Noorenberghe
141ab0bb7f Bug 1166947 - Run login capture code upon page navigation if there are password fields present outside a <form>. r=dolske 
MozReview-Commit-ID: Edx3XM3caX3

--HG--
rename : toolkit/components/passwordmgr/test/mochitest/test_formless_submit.html => toolkit/components/passwordmgr/test/mochitest/test_formless_submit_navigation.html
rename : toolkit/components/passwordmgr/test/mochitest/test_formless_submit.html => toolkit/components/passwordmgr/test/mochitest/test_formless_submit_navigation_negative.html
 2016-07-27 22:12:25 -07:00
Florian Quèze
d852e385df Bug 1289240 - search plugins from an in-use langpack should be treated as default plugins, r=adw. 2016-07-27 19:28:33 +02:00
Kris Maglione
87cb739adf Bug 1288885: Split out the longest-running alarm tasks into separate units. r=aswan 
MozReview-Commit-ID: GwnRd6gncGI

--HG--
rename : toolkit/components/extensions/test/xpcshell/test_ext_alarms.js => toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js
rename : toolkit/components/extensions/test/xpcshell/test_ext_alarms.js => toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js
rename : toolkit/components/extensions/test/xpcshell/test_ext_alarms.js => toolkit/components/extensions/test/xpcshell/test_ext_alarms_replaces.js
extra : rebase_source : f6e989cee3980c80ab1409366f3bdb99effc365e
extra : histedit_source : 8a12aba658b198b0b173187857159e92d09d4458
 2016-07-22 19:29:58 -07:00
Kris Maglione
58a6164f54 Bug 1288885: Migrate background page mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: Fiv7sArlWDw

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_background_generated_load_events.html => toolkit/components/extensions/test/xpcshell/test_ext_background_generated_load_events.js
rename : toolkit/components/extensions/test/mochitest/test_ext_background_generated_reload.html => toolkit/components/extensions/test/xpcshell/test_ext_background_generated_reload.js
rename : toolkit/components/extensions/test/mochitest/test_ext_background_sub_windows.html => toolkit/components/extensions/test/xpcshell/test_ext_background_sub_windows.js
rename : toolkit/components/extensions/test/mochitest/test_ext_background_window_properties.html => toolkit/components/extensions/test/xpcshell/test_ext_background_window_properties.js
extra : rebase_source : feeb29536c588816494fdb578f897d7d88ecb23c
extra : histedit_source : 44b8f476bf0953c0192e5248cc9d5984a73f7d6f
 2016-07-22 18:44:27 -07:00
Kris Maglione
5ece514d52 Bug 1288885: Migrate downloads mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: Z67uTNUcqD

--HG--
rename : toolkit/components/extensions/test/mochitest/file_download.html => toolkit/components/extensions/test/xpcshell/data/file_download.html
rename : toolkit/components/extensions/test/mochitest/file_download.txt => toolkit/components/extensions/test/xpcshell/data/file_download.txt
rename : toolkit/components/extensions/test/mochitest/test_ext_downloads.html => toolkit/components/extensions/test/xpcshell/test_ext_downloads.js
rename : toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_download.html => toolkit/components/extensions/test/xpcshell/test_ext_downloads_download.js
rename : toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_misc.html => toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js
rename : toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_search.html => toolkit/components/extensions/test/xpcshell/test_ext_downloads_search.js
extra : rebase_source : 5fd93c86ec6200290fc514ed568a72fa0e54293b
extra : histedit_source : 63b77e62e6eaf86905132397f8d65fcf6849531b
 2016-07-22 18:49:50 -07:00
Kris Maglione
063286898a Bug 1288885: Migrate storage mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: 1DYgv3LNDOW

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_storage.html => toolkit/components/extensions/test/xpcshell/test_ext_storage.js
extra : rebase_source : 49ffed0516446d8ca5dc647c1fee8b3efc6867d8
extra : histedit_source : 6eeaa383e74b7a6f6d86f87fe9a2f0d9b88a4635
 2016-07-22 17:32:31 -07:00
Kris Maglione
ac8debc6f4 Bug 1288885: Migrate bookmarks mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: 9PFJcqXXxhU

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html => browser/components/extensions/test/xpcshell/test_ext_bookmarks.js
extra : rebase_source : 2c9d2611b967733ff685cb9ce7886ae326eae6a3
extra : histedit_source : 880c65df5bbd9721e1c7dcf963396e3d73b49c5d
 2016-07-22 17:29:52 -07:00
Kris Maglione
ce003f10da Bug 1288885: Migrate localStorage mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: 1sjpnsKYEv5

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_localStorage.html => toolkit/components/extensions/test/xpcshell/test_ext_localStorage.js
extra : rebase_source : c33f89ad30aa7785a4a12efe48cb498a1471cc72
extra : histedit_source : de6f946ab5b820efad5d75aef85055b3e8bbd50b
 2016-07-27 21:47:53 -07:00
Kris Maglione
55707f2b84 Bug 1288885: Migrate simple extension mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: BiaTf6u43XP

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html => toolkit/components/extensions/test/xpcshell/test_ext_background_runtime_connect_params.js
rename : toolkit/components/extensions/test/mochitest/test_ext_extension.html => toolkit/components/extensions/test/xpcshell/test_ext_extension.js
rename : toolkit/components/extensions/test/mochitest/test_ext_idle.html => toolkit/components/extensions/test/xpcshell/test_ext_idle.js
rename : toolkit/components/extensions/test/mochitest/test_ext_onmessage_removelistener.html => toolkit/components/extensions/test/xpcshell/test_ext_onmessage_removelistener.js
rename : toolkit/components/extensions/test/mochitest/test_ext_runtime_getPlatformInfo.html => toolkit/components/extensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js
rename : toolkit/components/extensions/test/mochitest/test_ext_runtime_sendMessage.html => toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage.js
rename : toolkit/components/extensions/test/mochitest/test_ext_simple.html => toolkit/components/extensions/test/xpcshell/test_ext_simple.js
extra : rebase_source : a4931c7a6165193c45ea99538d4cc8300317929f
extra : amend_source : eb3ec077285d7ad83b89b6f1a8df73230a58ab20
extra : intermediate-source : af745bd5c20928ef776a7c94c76cb9c87ac77c71
extra : source : f9fd137c9691e75d9e01d61be14608e7f28c7815
 2016-07-22 16:57:58 -07:00
Kris Maglione
6cab484667 Fix botched backout for changeset af745bd5c209 (bug 1288885) 
MozReview-Commit-ID: KCC6FQ0yn45

--HG--
extra : amend_source : 1d7255b7fa215407c958d3ba51915f22461d6526
 2016-07-28 13:49:38 -07:00
Kris Maglione
55cbd3e601 Backed out changeset af745bd5c209 for xpcshell test failures. 
MozReview-Commit-ID: Dt6n5mRFLgN

--HG--
extra : amend_source : 2be72943ed781129bed07c3723d87b0f3d7eca9c
 2016-07-28 13:42:02 -07:00
Kris Maglione
ec4a2f7021 Bug 1288885: Migrate simple extension mochitests to xpcshell. r=aswan 
MozReview-Commit-ID: BiaTf6u43XP

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html => toolkit/components/extensions/test/xpcshell/test_ext_background_runtime_connect_params.js
rename : toolkit/components/extensions/test/mochitest/test_ext_extension.html => toolkit/components/extensions/test/xpcshell/test_ext_extension.js
rename : toolkit/components/extensions/test/mochitest/test_ext_idle.html => toolkit/components/extensions/test/xpcshell/test_ext_idle.js
rename : toolkit/components/extensions/test/mochitest/test_ext_onmessage_removelistener.html => toolkit/components/extensions/test/xpcshell/test_ext_onmessage_removelistener.js
rename : toolkit/components/extensions/test/mochitest/test_ext_runtime_connect_no_receiver.html => toolkit/components/extensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js
rename : toolkit/components/extensions/test/mochitest/test_ext_runtime_getPlatformInfo.html => toolkit/components/extensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js
rename : toolkit/components/extensions/test/mochitest/test_ext_runtime_sendMessage.html => toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage.js
rename : toolkit/components/extensions/test/mochitest/test_ext_runtime_sendMessage_no_receiver.html => toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js
rename : toolkit/components/extensions/test/mochitest/test_ext_simple.html => toolkit/components/extensions/test/xpcshell/test_ext_simple.js
extra : rebase_source : 3de076c2130a02437313dc3b59573af3a9202273
extra : histedit_source : 989ba78b7408bbc73f7caefc2147b0911e1eed7c
 2016-07-22 16:57:58 -07:00
Kris Maglione
c791f6dd21 Bug 1288885: Migrate alarms tests to xpcshell. r=aswan 
MozReview-Commit-ID: 6NPOqsAfWSb

--HG--
rename : toolkit/components/extensions/test/mochitest/test_ext_alarms.html => toolkit/components/extensions/test/xpcshell/test_ext_alarms.js
extra : rebase_source : 8d3fa5e2a00c3a0114d25190e8658c1bad7b69c1
extra : histedit_source : 88eaa95b5fe8b6b7f3ac2770beef7b0f7fc33d57
 2016-07-22 16:21:42 -07:00
Kris Maglione
ff96d80145 Bug 1288885: Support testing WebExtensions from xpcshell tests. r=aswan 
Most of the test helper code is derived from the SpecialPowers/ExtensionTestUtils
code that does the same. Eventually, the two implementations should probably
be unified, but I don't think it's worth the trouble for now.

MozReview-Commit-ID: 7Yy9jWkGsMM

--HG--
extra : rebase_source : 92cc01e1cde97fa79250d51bad5a56181fbe715c
 2016-07-24 16:09:26 -07:00
Chris Pearce
9d4e51cf50 Bug 1288311 - Remove GMP install failed/unsupported telemetry reporting code. r=spohl 
The telemetry result indicate that unexplained install failures are very rare,
so we don't need to bother keeping this probe.

We should still need to check whether the GMP files disappear from disk, as
telemetry indicates this does happen, though quite rarely.

MozReview-Commit-ID: K64tlRajACJ

--HG--
extra : rebase_source : 0778f4bdf85cbd448ca71694c65bd99806307386
 2016-07-21 16:31:56 +12:00
Chris Pearce
822ff581b6 Bug 1288311 - Remove GMP unsupported/installation failure telemetry probes. r=francois 
The telemetry results indicate there's not a big problem here that we need to
solve. So doesn't seem worth while keeping the probes.

MozReview-Commit-ID: Jnh2Od6jV2X

--HG--
extra : rebase_source : e68addd5883b56c20caaad4c4e958221069f9692
 2016-07-21 16:16:51 +12:00
Chris Pearce
a5fbd55b06 Bug 1288311 - Extend VIDEO_CAN_CREATE_*_DECODER telemetry probes. r=francois 
We're actively trying to encourage people to install Windows system decoders to
drive the "can't create" number to 0. So we need this probe to measure our
progress.


MozReview-Commit-ID: BDE7nbaK4NX

--HG--
extra : rebase_source : d98da189ad94906ff79085aac7e0d4bed9e018ce
 2016-07-21 16:09:42 +12:00
Rob Wu
93136b1f19 Bug 1286746 - Invoke port.onDisconnect if there are no onConnect listeners. r=kmag 
MozReview-Commit-ID: DPs36oFm25J

--HG--
extra : rebase_source : 2c104d98c7d51744d1970a941677a1d4de31852b
 2016-07-15 17:46:00 -07:00