77c0488fa25d712dfc3f0d1fb9161e07cf2a2693: Merge m-c to fx-team a=merge
Wes Kocher <wkocher@mozilla.com> - Mon, 05 Jan 2015 17:29:14 -0800 - rev 222228
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Merge m-c to fx-team a=merge
121c15407fbdf9755828d1c9202cfa1882e40b9c: Bug 1116525 - Remove unused local variables in TextSelection, r=margaret
Pierpaolo Calligaris <p.calligaris.code@gmail.com> - Mon, 05 Jan 2015 19:49:25 -0500 - rev 222227
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1116525 - Remove unused local variables in TextSelection, r=margaret
a2719cbe55bde9d5e50b7f892aa501bf434e0e90: Bug 1117158 followup followup: typo, a=gavin
Gavin Sharp <gavin@gavinsharp.com> - Mon, 05 Jan 2015 13:37:32 -0800 - rev 222226
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1117158 followup followup: typo, a=gavin
1774dfe83245a4dd1e90b1b520e6cf1fdc049c80: Bug 1117230 - Allow for tests to disable the updater. r=snorp
Richard Newman <rnewman@mozilla.com> - Mon, 05 Jan 2015 15:12:03 -0800 - rev 222225
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1117230 - Allow for tests to disable the updater. r=snorp
9304baf29af2cac48129afa9750ea81cff3162ed: Bug 907768 - Re-enable testSearchSuggestions on all platforms. r=bnicholson
Richard Newman <rnewman@mozilla.com> - Mon, 05 Jan 2015 15:12:03 -0800 - rev 222224
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 907768 - Re-enable testSearchSuggestions on all platforms. r=bnicholson
a2f784d85bf9217ce368a9d9ac661a1877d82b3a: Bug 907768 - Rewrite search suggestion test hooks, fix network bypass in SuggestClient. r=bnicholson
Richard Newman <rnewman@mozilla.com> - Mon, 05 Jan 2015 15:12:03 -0800 - rev 222223
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 907768 - Rewrite search suggestion test hooks, fix network bypass in SuggestClient. r=bnicholson This patch fixes all testSearchSuggestions intermittent failures, except for those that appear to be caused by update checks on 2.3. It also replaces all waitForTest (deprecated) calls with waitForCondition.
0dd788e4b214118464eb93a5d098ffa0f54b884e: Bug 1116199 - Fix web console backwards compatibility with pre 37 servers that are missing evaluateJSAsync;r=jryans
Brian Grinstead <bgrinstead@mozilla.com> - Mon, 05 Jan 2015 13:15:04 -0800 - rev 222222
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1116199 - Fix web console backwards compatibility with pre 37 servers that are missing evaluateJSAsync;r=jryans
deee031b754a10f2db19497aa8d0505b9bf89632: Bug 956444 - Migrate from Old Sync to Firefox Accounts based on meta/fxa_credentials migration sentinel. r=rnewman
Nick Alexander <nalexander@mozilla.com> - Mon, 05 Jan 2015 13:50:08 -0800 - rev 222221
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 956444 - Migrate from Old Sync to Firefox Accounts based on meta/fxa_credentials migration sentinel. r=rnewman ======== https://github.com/mozilla-services/android-sync/commit/5dec5a7929c418153846ea1dce3dc00a4ef75cb6 Author: Nick Alexander <nalexander@mozilla.com> Date: Wed Dec 17 18:03:44 2014 -0800 Bug 956444 - Post: Persist fetch timestamp on 404. I imported and modified your old code; this looks like an oversight from there, but I want to call it out. If we don't persist the timestamp, then the stamp persisted to config is always -1, meaning we GET (and 404) the credentials on every sync. You have code to compare info/collections against the fetched timestamp so I think we should persist even on 404. ======== https://github.com/mozilla-services/android-sync/commit/520341ce660c332626064087c0d8a6de0f36b8ce Author: Richard Newman <rnewman@twinql.com> Date: Thu Jan 2 20:44:58 2014 -0800 Bug 956444 - Part 2: Fetch and process meta/fxa_credentials migration sentinel. This adds a Sync stage that tries to create a new Firefox Account in the MigratedFromSync11 state when a known migration sentinel is seen. ======== https://github.com/mozilla-services/android-sync/commit/2f4ea5c14b96c95564f0cc4a0d7241767bf0c15b Author: Nick Alexander <nalexander@mozilla.com> Date: Fri Dec 12 16:44:25 2014 -0800 Bug 956444 - Part 1: Add informMigrated callback. GlobalSession and Sync stages don't have access to the Android Account object. This callback maintains the existing information hiding. ======== https://github.com/mozilla-services/android-sync/commit/11a8f6c1ef23580e6a61759bda909e86b588c040 Author: Nick Alexander <nalexander@mozilla.com> Date: Fri Dec 12 16:26:02 2014 -0800 Bug 956444 - Pre: Unpickle accounts during package upgrade. This makes it a little easier to test: you can |adb push| or |adb shell echo ''| a known sync.accounts.json file onto device and then re-install the package to restore a known Sync Account.
fa14cd998e39cf0f5c1891bff1e534a5104dbbca: Bug 1117158 followup: disable GeoIP lookup in services/healthreport/tests/xpcshell/test_provider_searches.js to fix xpcshell bustage on CLOSED TREE
Gavin Sharp <gavin@gavinsharp.com> - Mon, 05 Jan 2015 13:04:05 -0800 - rev 222220
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1117158 followup: disable GeoIP lookup in services/healthreport/tests/xpcshell/test_provider_searches.js to fix xpcshell bustage on CLOSED TREE
5a4f5d698c2dc0386db2d85dd774dacba32f43bb: Bug 1117867 - Disable e10s by default for a week of non-e10s testing on Nightly. r=felipe.
Mike Conley <mconley@mozilla.com> - Mon, 05 Jan 2015 13:44:25 -0500 - rev 222219
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1117867 - Disable e10s by default for a week of non-e10s testing on Nightly. r=felipe.
edabb01e0db7531e10083996f7ccc58afed92a72: Bug 474464 - Fennec should be using the browser status filter r=margaret
Mark Finkle <mfinkle@mozilla.com> - Mon, 05 Jan 2015 14:01:32 -0500 - rev 222218
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 474464 - Fennec should be using the browser status filter r=margaret
222e426541b9244be2e033f792b3677303d6a7d8: Bug 1116287: SEARCH_SERVICE_INIT_SYNC should not expire, r=rvitillo
Gavin Sharp <gavin@gavinsharp.com> - Mon, 05 Jan 2015 08:19:58 -0800 - rev 222217
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1116287: SEARCH_SERVICE_INIT_SYNC should not expire, r=rvitillo
20dd052812f8a5c44d420c2220bd800bc230ab6c: Bug 1117158: move search service prefs to all.js, r=markh/margaret/fabrice
Gavin Sharp <gavin@gavinsharp.com> - Mon, 05 Jan 2015 08:01:12 -0800 - rev 222216
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1117158: move search service prefs to all.js, r=markh/margaret/fabrice
07317d58d433a97d5a7a01d7155054ae88a97723: Bug 1115696: fix browser_aboutHome.js to work correctly with inContent prefs enabled/disabled, r=mak
Gavin Sharp <gavin@gavinsharp.com> - Mon, 05 Jan 2015 07:59:12 -0800 - rev 222215
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 1115696: fix browser_aboutHome.js to work correctly with inContent prefs enabled/disabled, r=mak
8f91a31d4cec2830c135037fec299490f1cca2ff: Bug 575918: enable IPC tests on Mac since they work now, r=bsmedberg
Gavin Sharp <gavin@gavinsharp.com> - Fri, 02 Jan 2015 17:00:20 -0800 - rev 222214
Push 28060 by ryanvm@gmail.com at Tue, 06 Jan 2015 16:02:34 +0000
Bug 575918: enable IPC tests on Mac since they work now, r=bsmedberg
4d91c33b351cabf7fb7bff4575e33d92bad45830: Merge inbound to m-c. a=merge
Ryan VanderMeulen <ryanvm@gmail.com> - Tue, 06 Jan 2015 10:52:47 -0500 - rev 222213
Push 28059 by ryanvm@gmail.com at Tue, 06 Jan 2015 15:53:01 +0000
Merge inbound to m-c. a=merge
1f32089c6733f9beeced00dc0aced37f5fe0a585: Backed out changesets 4d2d510fbd62, 5e51dc838a89, and 652bd77f36c1 (bug 1116714) for Linux opt mochitest-dt orange.
Ryan VanderMeulen <ryanvm@gmail.com> - Tue, 06 Jan 2015 08:57:43 -0500 - rev 222212
Push 28059 by ryanvm@gmail.com at Tue, 06 Jan 2015 15:53:01 +0000
Backed out changesets 4d2d510fbd62, 5e51dc838a89, and 652bd77f36c1 (bug 1116714) for Linux opt mochitest-dt orange. CLOSED TREE
1d470bfb9e47db87db7b1654758a57d670ed8a0d: Bug 1117596 - Simplify the code in nsBlockFrame::AddFrames somewhat to avoid a false positive warning ('Uninitialized variable: overflowLines'). r=roc
Mats Palmgren <mats@mozilla.com> - Tue, 06 Jan 2015 11:46:26 +0000 - rev 222211
Push 28059 by ryanvm@gmail.com at Tue, 06 Jan 2015 15:53:01 +0000
Bug 1117596 - Simplify the code in nsBlockFrame::AddFrames somewhat to avoid a false positive warning ('Uninitialized variable: overflowLines'). r=roc
b25b5bedc53a28d5fbe6639fb38662483ce94c38: Bug 1117240 - Check return value when creating type object in RegExpCompartment::createMatchResultTemp() r=bhackett
Jon Coppeard <jcoppeard@mozilla.com> - Tue, 06 Jan 2015 11:28:16 +0000 - rev 222210
Push 28059 by ryanvm@gmail.com at Tue, 06 Jan 2015 15:53:01 +0000
Bug 1117240 - Check return value when creating type object in RegExpCompartment::createMatchResultTemp() r=bhackett
3405b354e2f1e49513ffb49b24a8106b4b3d06a9: Bug 1116753 - Add 'explicit' to the nsRootBoxFrame one-arg ctor to fix static analysis failure. r=me
Mats Palmgren <mats@mozilla.com> - Tue, 06 Jan 2015 10:07:04 +0000 - rev 222209
Push 28059 by ryanvm@gmail.com at Tue, 06 Jan 2015 15:53:01 +0000
Bug 1116753 - Add 'explicit' to the nsRootBoxFrame one-arg ctor to fix static analysis failure. r=me
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip