Gregory Szorc
78563e19ec
Merge mozilla-central into services
2013-04-22 12:33:04 -07:00
Richard Newman
575a3d14ca
Bug 859920 - Some TPS tests failed when running using mozilla-central build. r=trivial
2013-04-18 21:30:28 -07:00
Gregory Szorc
c9c21b22f4
Merge mozilla-central into services-central
2013-04-15 16:55:11 -07:00
Richard Newman
ef5fbc29f7
Bug 859920 - Some TPS tests failed due to removed autoHide pref. r=trivial, a=test-only
2013-04-09 12:26:11 -07:00
Raymond Lee
cbfeb4cc13
Bug 852034 - Replace restoreBookmarksFromJSONFile with importFromFile. r=mano
2013-04-17 13:36:02 +08:00
Kyle Machulis
72a717a860
Bug 855465 - Add emacs python mode comments to moz.build files; r=gps
2013-04-01 11:36:59 -07:00
Bhavana Bajaj
c68f877f73
Merging in version bump NO BUG
2013-04-01 11:28:13 -07:00
Raymond Lee
de3be8a99d
Bug 852041 - Part 2: Use BookmarkJSONUtils.exportToFile in services/sync. r=rnewman
2013-04-09 17:15:34 +08:00
Ryan VanderMeulen
95bf443385
Merge the last PGO-green inbound changeset to m-c.
2013-04-15 21:49:22 -04:00
Nick Alexander
0481627d39
Bug 848519 - Part 3: Replace services-common/preferences.js with gre/modules/Preferences.jsm in imports. r=gavin
2013-04-15 12:45:37 -07:00
Mike Shal
7ecea60097
Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps
2013-03-19 11:47:00 -07:00
Gregory Szorc
7755733a85
Bug 784841 - Part 18ε: Convert /services; f=Ms2ger rs=ted
2013-02-25 12:47:24 -08:00
Gavin Sharp
6a0bfaa745
Remove some unnecessary preprocessing, no bug
...
--HG--
extra : rebase_source : b8bfed7a5b55652fd8a9b3bf3c601accb8b2022f
2013-02-17 17:49:25 -08:00
Lukas Blakk
96a4d23df2
Merging in version bump NO BUG CLOSED TREE
2013-02-19 09:35:19 -08:00
Mike Hommey
26e3714874
Bug 755724 - Move browser application in a subdirectory. r=jimm
2013-02-11 14:10:16 +01:00
Richard Newman
a9430d6624
Merge m-c to s-c.
2013-02-06 19:26:09 -08:00
Marco Bonardo
4f925597b9
Bug 826409 - Remove onBeforeDeleteURI and onBeforeItemRemoved notifications.
...
r=Mano sr=gavin
2013-02-06 20:48:56 +01:00
Gregory Szorc
ccc4e1c4a4
Bug 838717 - Import main.js before accessing Weave; r=rnewman
2013-02-06 10:32:00 -08:00
Phil Ringnalda
2b3d881d7c
Merge m-c to s-c
2013-02-04 18:12:00 -08:00
Richard Newman
08095b1df2
Bug 836206 - Split out or rewrite CommonUtils.jsonLoad/jsonSave. r=gps
...
--HG--
rename : services/common/tests/unit/test_utils_json.js => services/sync/tests/unit/test_utils_json.js
2013-02-03 00:51:26 -08:00
Ehsan Akhgari
395197733f
Merge mozilla-cental into mozilla-inbound
2013-01-31 11:10:40 -05:00
Gregory Szorc
c47eb8f3a2
Bug 836120 - Reduce memory overhead of Sync when it's not configured; r=rnewman
...
If Sync is (likely) not configured, the only loaded JS is for the XPCOM
service itself.
The UI code is now smart enough to initialize the Sync service if it
isn't yet loaded. This addresses bug 825728.
2013-01-30 07:05:12 -08:00
Gregory Szorc
c1ef78d2ba
Bug 836086 - Lazy load Sync's keys.js; r=rnewman
2013-01-29 16:46:22 -08:00
Ehsan Akhgari
565d0479c3
Bug 817477 - Remove support for global private browsing mode; r=jdm,glandium
...
--HG--
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
2013-01-29 13:12:13 -05:00
Richard Newman
b78783892f
Bug 836369 - Intermittent test_history_tracker.js | test failed | true == false. r=trivial,test-only
2013-01-30 15:30:53 -08:00
Andres Hernandez
3f91b9e564
Bug 739217 - Part 3: services replacement of codebase usage of synchronous isVisited with asynchronous isURIVisited. r=rnewman
2013-01-18 12:01:40 -06:00
Gregory Szorc
6ddc34b300
Merge mozilla-central into services-central
2013-01-11 11:07:05 -08:00
Richard Newman
e1dccc7a9b
Bug 829656 - TEST-UNEXPECTED-FAIL | /builds/slave/talos-slave/test/build/xpcshell/tests/services/common/tests/unit/head_helpers.js | 2 == 1. r=trivial
2013-01-11 10:03:15 -08:00
Mark Banner
4d31a85097
Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
...
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
extra : transplant_source : k%8A%F7%25%F3%22h%E5%CEQ%AB%9Ds%CA%B6/%962%86N
2013-01-10 22:02:38 +00:00
Mark Banner
b786539327
Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
...
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
2013-01-10 22:02:38 +00:00
Richard Newman
103245d3f4
Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial
2013-01-09 14:30:09 -08:00
Ed Morley
408ac4c83c
Bug 804479 - Disable test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js on debug runs for too many intermittent failures
2013-01-10 14:59:27 +00:00
Richard Newman
b1b58dd41f
Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial, TPS only so DONTBUILD
2013-01-09 14:30:09 -08:00
Ed Morley
48ca903ef9
Backout a38692ea87ae (bug 827303) for xpcshell failures on a CLOSED TREE
2013-01-09 23:45:36 +00:00
Mark Banner
146bf64467
Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
...
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
2013-01-09 22:38:34 +00:00
David Rajchenbach-Teller
bf032a32a6
Bug 772211 - Get rid of some uses of addVisit. r=mak77, r=rnewman
2013-01-08 19:40:06 -05:00
Alex Keybl
9fc46ad72d
Merging in version bump NO BUG
2013-01-07 12:31:33 -08:00
Gregory Szorc
2a5ae000e2
Merge mozilla-central into services-central
...
--HG--
rename : content/html/content/public/nsHTMLCanvasElement.h => content/html/content/public/HTMLCanvasElement.h
rename : content/html/content/src/nsHTMLCanvasElement.cpp => content/html/content/src/HTMLCanvasElement.cpp
2013-01-06 10:06:07 -08:00
Richard Newman
b709251bb2
Bug 826421 - Follow-up: remove unnecessary method. r=trivial
2013-01-04 20:03:46 -08:00
Richard Newman
58affe4efc
Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak
2013-01-04 09:45:12 -08:00
Richard Newman
555f8728ab
Bug 826086 - Handle errors in asyncOpen. r=gps
2013-01-02 15:40:03 -08:00
Richard Newman
537115a725
Bug 806494 - Fix resource header copying on internal redirect. r=gps
2013-01-04 22:23:50 -08:00
Richard Newman
3c3dcb655a
Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak
2013-01-04 09:45:12 -08:00
Richard Newman
9326b3d9c6
Bug 696974 - Bookmarks engine: "invalid 'in' operand this._modified" in reconcile. r=gps
2012-12-22 12:44:05 -08:00
Richard Newman
98503a2e1b
Bug 699546 - Log more backoff information: X-Weave-Backoff, Retry-After. r=gps
2012-12-22 11:43:56 -08:00
Richard Newman
2e84f032e2
Bug 698087 - Remove Service.updatedURL and associated consts. r=gps
2012-12-22 11:43:50 -08:00
Richard Newman
f181d0acd8
Merge m-c to s-c.
2012-12-22 11:32:28 -08:00
Richard Newman
b74691db4f
Bug 650941 - Use run_next_test in test_resource_ua.js. r=mechanical
2012-12-21 23:22:00 -08:00
Richard Newman
90daf700c2
Bug 806494 - Part 1: additional logging and safety for header copying. r=gps
2012-12-18 11:43:58 -08:00
Richard Newman
b8f7251de3
Merge m-c to s-c (including fixed conflict in Android Sync manifest).
...
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable/tabs_button.xml.in => mobile/android/base/resources/drawable/tabs_button.xml
rename : mobile/android/base/resources/drawable/tabs_level.xml.in => mobile/android/base/resources/drawable/tabs_level.xml
2012-12-15 17:08:14 -08:00
Richard Newman
aa45233a91
Bug 819262 - Additional tests for bookmark application in Sync. r=gps
2012-12-14 14:00:40 -08:00
Richard Newman
ceeb64c2e7
Merge m-c to s-c.
2012-12-10 13:01:43 -08:00
Richard Newman
80a3f4f3ee
Merge m-c to s-c.
2012-12-05 23:59:56 -08:00
Richard Newman
311ea9597c
Merge m-c to s-c.
2012-11-27 21:24:41 -08:00
Richard Newman
9f33dc8380
Merge m-c to s-c.
2012-11-21 09:37:58 -08:00
Richard Newman
da2eaf1742
Merge m-c to s-c.
2012-11-19 18:10:54 -08:00
Alex Keybl
d1de145dd7
Merging in version bump NO BUG
2012-11-19 12:03:27 -08:00
Richard Newman
d47fc2f956
Bug 817232 - Don't apply incoming deletions for special folders. r=gps
2012-12-04 16:49:55 -08:00
Michal Jaskurzynski
fc42a78b29
Bug 424712 - Server location needs a slash at the end. r=rnewman
2012-11-12 09:48:26 -08:00
Richard Newman
85cab35d85
Bug 804479 - Intermittent test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js | test failed (with xpcshell return code: -2147483645), "ASSERTION: thread pool wasn't shutdown… " r=gps
2012-12-05 16:46:25 -08:00
Ed Morley
ee93273e84
Backout 545cb0d6b5c6 (bug 811490), 4fd6fc029bbe (bug 722977) for xpcshell failures
2012-11-16 19:15:18 +00:00
Andres Hernandez
97b57987ba
Bug 811490 - Convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode; r=ehsan,rnewman
...
--HG--
extra : rebase_source : 84ba6b5df17aecc78569596fbc02d19fec312b00
2012-11-15 18:33:31 -06:00
Andres Hernandez
09155dbef7
Bug 722977 - Tabs engine uses global Svc.Private to make decisions based on private browsing state; r=ehsan,gps,rnewman
...
--HG--
extra : rebase_source : 49f920e3a961a6c103bae28d62e2a322a5f9fad1
2012-11-09 10:48:23 -06:00
Kyle Huey
9ce11fb93c
Bug 813766: Set EXPORTED_SYMBOLS on this instead of the global. r=gps
2012-11-26 08:54:17 -08:00
Ehsan Akhgari
eec2e6f2b2
Bug 823725 - Remove the Svc.Private getter since it is no longer used; r=rnewman
2012-12-20 17:43:13 -05:00
Richard Newman
e5f7a50a99
Bug 806494 - Part 1: additional logging and safety for header copying. r=gps
2012-12-18 11:42:22 -08:00
Richard Newman
9aa55288cf
Bug 819262 - Additional tests for bookmark application in Sync. r=gps
2012-12-14 14:00:40 -08:00
Richard Newman
b7b6981ce2
Bug 808750 - More logging and safety in resource callbacks. r=gps
2012-11-05 17:31:12 -08:00
Richard Newman
e867ebadd9
Bug 693427 - More logging and fixes for filelog cleanup. r=gps
2012-11-05 16:05:06 -08:00
Richard Newman
6092e36cd9
Merge m-c to s-c.
2012-11-01 12:28:15 -07:00
Richard Newman
dad2ef0871
Bug 693427 - Intermittent TEST-UNEXPECTED-FAIL | xpcshell/tests/services/sync/tests/unit/test_errorhandler_filelog.js | test failed (with xpcshell return code: 0) | false == true. r=trivial
2012-10-31 17:07:16 -07:00
Richard Newman
d29f11cef0
Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage).
2012-10-29 17:47:04 -07:00
Richard Newman
e78c3da7ed
Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps
2012-10-29 15:24:52 -07:00
Richard Newman
8a331845b5
Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps
2012-10-29 15:22:31 -07:00
Richard Newman
ecb5f27751
Bug 795800 - Rework test_addons_store to be more robust. r=gps
...
* * *
Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps
2012-10-25 16:51:32 -07:00
Kyle Huey
0469a02b25
Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon
...
--HG--
extra : rebase_source : 98337b6a8c07d05e8c961a452dd05a7d75c3c60b
2012-10-31 09:13:28 -07:00
Richard Newman
54de4fc54f
Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps
2012-10-23 17:44:33 -07:00
Vicamo Yang
a78b5b38c7
Backout 67cb43bb8865: Breaks B2G Marionette
2012-10-31 16:35:11 +08:00
Kyle Huey
9a3674d80a
Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon
2012-10-30 12:28:11 -07:00
Ed Morley
4144129728
Backout a145ded68994, e0cf397089ec & 1545e91c658e (bug 798491) for bustage on a CLOSED TREE
2012-10-30 17:02:31 +00:00
Kyle Huey
50b5d3f681
Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon
2012-10-30 08:26:12 -07:00
Richard Newman
588a039d52
Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps
...
* * *
Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage).
2012-10-29 15:24:52 -07:00
Richard Newman
7d99628c11
Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps
2012-10-29 15:22:31 -07:00
Richard Newman
c37657330d
Bug 798430 - Copy our set HTTP headers across channel redirects. r=gps
2012-10-10 11:48:16 -07:00
Richard Newman
63b2c29f6e
Merge m-c to s-c.
2012-10-08 17:08:01 -07:00
Alex Keybl
5e5b54cfae
Merging in version bump NO BUG
2012-10-08 11:01:15 -07:00
Gregory Szorc
9948a801a7
Merge mozilla-central into services-central
2012-09-25 11:00:01 -07:00
Gregory Szorc
f96ef85591
Bug 792546 - Part 5: Clean up excessive imports; r=rnewman
2012-09-24 13:46:19 -07:00
Gregory Szorc
3143299126
Bug 792546 - Part 4: Move utility functions to testing-only JS module; r=rnewman
2012-09-24 13:45:49 -07:00
Gregory Szorc
d16874d957
Bug 792546 - Part 2: Move fake services into testing-only JS module; r=rnewman
...
We still import these functions in head.js. This will be cleaned up
later once functionality from head.js that uses them is moved into a
testing-only JS module.
2012-09-24 13:42:54 -07:00
Gregory Szorc
feb37233f3
Bug 792546 - Part 1: Move rotary engine to a testing-only JS module; r=rnewman
2012-09-24 13:42:31 -07:00
Gregory Szorc
15b3f3976e
Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman
...
Due to a bug in the add-on sync implementation, resetting Sync would
cause all add-ons to be uninstalled and not replaced with the server
data.
2012-09-21 11:22:59 -07:00
Gregory Szorc
fadf7fd538
Merge mozilla-central into services-central
2012-09-18 11:37:04 -07:00
Gregory Szorc
a3be692568
Bug 787273 - Part 8: Make TPS go through main.js for service instance; r=rnewman
2012-09-18 11:34:25 -07:00
Gregory Szorc
b6376f859c
Bug 787273 - Part 7: Expose Status an an instance variable on Service; r=rnewman
...
The global Status is still there. But Service and its derived objects
avoid the singleton lookup.
There are likely a few lingering tests that reference Status when they
should reference Service.status. These will be dealt with when Status is
refactored.
2012-09-14 16:02:33 -07:00
Gregory Szorc
4192f76f6e
Bug 787273 - Part 6: Remove Weave export from service.js; r=rnewman
...
This is mostly minor cosmetic changes. Weave was being exported from
service.js for no apparent reason. It was mostly used by tests.
There was a reference to it in engines.js, which should have been caught
when the engines were associated with a service instance. engines.js now
does the right thing.
Weave is no longer exported by service.js. Tests and modules no longer
import main.js.
WeaveSvc was also renamed to Sync11Service because why not.
Weave continues to be the main public API.
2012-09-14 16:02:33 -07:00
Gregory Szorc
5ecb759622
Bug 787273 - Part 5: Remove the CollectionKeys singleton; r=rnewman
...
CollectionKeys is gone. Instead, we export CollectionKeyManager (the
underlying type) and an instance is available on the Service singleton.
2012-09-14 16:02:33 -07:00
Gregory Szorc
7508d3694e
Bug 787273 - Part 4: Refactor Identity to not be a singleton; r=rnewman
...
Access to IdentityManager functionality now goes through the Service
singleton.
2012-09-14 16:02:33 -07:00
Gregory Szorc
86496151d6
Bug 787273 - Part 3: Don't rely on Identity in SyncStorageRequest; r=rnewman
...
The Identity singleton is going away. This refactors SyncStorageRequest
to not use it. Behavior now works like Resource. Instances are obtained
from the Service singleton and have authentication functionality
attached.
2012-09-14 16:02:32 -07:00
Gregory Szorc
6aed806b4c
Bug 787273 - Part 2: Refactor Resource and Record to not rely on singletons; r=rnewman
...
Resource currently relies on the Identity singleton to perform
authentication. This is bad magic behavior. Resource instances should
authenticate according to the service instance they are associated with.
This patch removes Identity magic from Resource. Everything using
Resource now explicitly assigns an authenticator which comes from
the service instance/singleton. This required API changes to Collection
and Record.
The preferred method to obtain a Resource instance is to call
getResource() on a service instance.
The end result of this patch looks a little weird, especially in test
code. You have things like Service.resource(Service.cryptoKeysURL).
This ugliness will go away when a unified storage service client is
used.
2012-09-14 16:02:32 -07:00