Commit Graph

3122 Commits

Author SHA1 Message Date
Phil Ringnalda
835bf59994 Merge m-c to s-c 2013-02-04 18:12:00 -08:00
Richard Newman
8a453142db 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
Richard Newman
b75441eccf Bug 836206 - Remove AITC client. r=gps 2013-02-03 00:51:26 -08:00
Richard Newman
684c2b54be Merge m-c to s-c. 2013-02-03 00:51:21 -08:00
Gregory Szorc
74022f5d9c Bug 828720 - Telemetry probes for Firefox Health Report; r=rnewman, f=vladan 2013-02-01 13:28:02 -08:00
Gregory Szorc
e629ae617e Bug 836186 - Don't load FHR providers until they are used; r=rnewman 2013-01-31 08:58:19 -08:00
Gregory Szorc
5316ef3410 Bug 836340 - Increase implicit acceptance interval; r=rnewman
The new value comes from Tom in Privacy.
2013-01-31 08:53:38 -08:00
Ehsan Akhgari
5adccf8c6d Merge mozilla-cental into mozilla-inbound 2013-01-31 11:10:40 -05:00
Gregory Szorc
c6c96c3474 Bug 836177 - Temporarily merge more JSMs to mitigate compartment overhead; r=rnewman
As with bug 834936, this is meant to be temporary until zones land and
we have decent JSM overhead levels.
2013-01-30 07:07:22 -08:00
Gregory Szorc
ef8e5bb3be 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
fe27b08497 Bug 836086 - Lazy load Sync's keys.js; r=rnewman 2013-01-29 16:46:22 -08:00
Ehsan Akhgari
32d278987e 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
Gregory Szorc
cf1a271733 Bug 834936 - Temporarily load JSMs into fewer compartments; r=rnewman
We concatenate JSMs together so we use less compartments and therefore
less memory. This is intended to be a temporary hack until the overhead
of compartments is less.
2013-01-27 11:26:48 -08:00
Richard Newman
15b0e79fdb Bug 832067 - Discard cached statements in healthreporter. r=gps 2013-01-25 00:39:01 -08:00
Richard Newman
18ea2ae0e4 Bug 830922 - Include version inside measurement payload. r=gps 2013-01-25 00:32:33 -08:00
Richard Newman
5ca4411e9f Bug 831404 - Add logging to test_policy.js. r=trivial,test-only 2013-01-30 20:07:34 -08:00
Richard Newman
f89fc66ebb Bug 836369 - Intermittent test_history_tracker.js | test failed | true == false. r=trivial,test-only 2013-01-30 15:30:53 -08:00
Richard Newman
7f6225bf52 Bug 834159 - Minor doc bugs in FHR. r=gps 2013-01-24 11:10:18 -08:00
Shih-Chiang Chien
1aab44bf08 Bug 752982 - Part 1: Implement captive portal detection service. r=thinker 2012-09-15 11:37:53 +08:00
Gregory Szorc
891d9cdbeb Bug 827157 - Part 2: report current session information. r=rnewman
The previous patch regressed this because HealthReporter was talking
directly to storage instead of going through the measurement instance.
2013-01-19 00:31:38 -08:00
Gregory Szorc
6d3ccffa19 Bug 827157 - Robust and performance sensitive recording of sessions; r=rnewman
We have introduced a new background service that captures session state
in preferences. Firefox Health Report now moves entries from preferences
to its database at payload generation time.

We've also introduced a few random APIs, such as enqueueTransaction()
and the ability for providers to have access to their own pref branch.
2013-01-18 22:35:07 -08:00
Andres Hernandez
9ef4ecb0f1 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
3c2914259d Bug 828703 - Correct removal of idle-daily observer; r=rnewman 2013-01-15 14:53:34 -08:00
Gregory Szorc
6104c9a813 Bug 828149 - Cancel timer during application shutdown. r=rnewman 2013-01-14 18:01:53 -08:00
Gregory Szorc
a602b2e45a Bug 828829 - Remove dump() from DataReportingService.js; r=trivial 2013-01-11 23:34:57 -08:00
Mike Connor
79e2fbeaa0 bug 719484 - build about:healthreport, r=dolske
--HG--
extra : rebase_source : 54dac2005640bcf6f0b37c16cfbf04bb11d5def1
2013-01-11 15:31:38 -08:00
Gregory Szorc
2531a73bed Bug 828829 - Refactor Health Report policy out of services/healthreport; r=rnewman
--HG--
rename : services/healthreport/HealthReportService.js => services/datareporting/DataReportingService.js
rename : services/healthreport/modules-testing/mocks.jsm => services/datareporting/modules-testing/mocks.jsm
rename : services/healthreport/policy.jsm => services/datareporting/policy.jsm
rename : services/healthreport/tests/xpcshell/test_policy.js => services/datareporting/tests/xpcshell/test_policy.js
extra : rebase_source : cf766bc99ff843f2d31f82b1c4be71313fbc65a8
2013-01-11 13:45:22 -08:00
Gregory Szorc
2a2c9840fe Merge mozilla-central into services-central 2013-01-11 11:07:05 -08:00
Richard Newman
453f9050ce 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
8af37e3c60 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
97bf467204 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
f7820b95f2 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
Richard Newman
2c2de1fa40 Merge m-c to s-c. 2013-01-09 12:48:01 -08:00
Gregory Szorc
80efde6b98 Bug 828101 - Initialize Firefox Health Report after session restore; r=rnewman 2013-01-09 12:10:31 -08:00
Mike Connor
7249f150c6 Bug 809094 - Move data upload choices to Advanced pref pane, add FHR option; r=gavin, gps 2013-01-03 23:45:15 -05:00
Gregory Szorc
b99ea5d08d Bug 827910 - Only include details for "plugin" and "extension" add-ons; r=rnewman 2013-01-08 12:07:27 -08:00
Gregory Szorc
63d9bbfcd1 Bug 827602 - Execute queued operations in FIFO not LIFO; r=rnewman 2013-01-07 16:29:25 -08:00
Alex Keybl
606aa67899 Merging in version bump NO BUG 2013-01-07 12:31:33 -08:00
Ed Morley
d4c467d016 Bug 812608 - Disable test_metrics_storage.js on all platforms now that more failures are appearing 2013-01-07 16:39:47 +00:00
Ed Morley
610e7db874 Bug 812608 - Disable test_metrics_storage.js on Windows too, for permapurple PGO timeouts 2013-01-07 16:19:47 +00:00
Ed Morley
48cd569941 Bug 812608 - Disable test_metrics_storage.js on Linux32 debug for permaorange timeouts 2013-01-07 16:01:36 +00:00
Ed Morley
78cf89c5ca Backout 9e11714fcba2 (bug 809094) for browser-chrome failures on a CLOSED TREE 2013-01-07 10:22:08 +00:00
Gregory Szorc
4280c24de2 Bug 808126 - Part 3: Use OS.File.stat() to look for missing directory; r=rnewman 2013-01-07 00:17:19 -08:00
Mike Connor
1a730fab1d bug 809094 - update pref pane to support Firefox Health Report, r=gavin,gps
--HG--
extra : rebase_source : 39ac9f3f0f107de91b17c136d6f06fe475858578
2013-01-03 23:45:15 -05:00
Gregory Szorc
2e373f285f Bug 808126 - Part 2: Work around bug in OS.File.exists(); r=rnewman 2013-01-06 23:03:42 -08:00
Gregory Szorc
c841dacde3 Bug 812608 - Part 4: Serially initialize providers; r=rnewman 2013-01-06 22:46:30 -08:00
Gregory Szorc
02e8a25504 Bug 827187 - Part 2: Fix test bustage; r=rnewman 2013-01-06 21:32:18 -08:00
Gregory Szorc
d7cdfb93bf Bug 827187 - Report default browser flag in Firefox Health Report; r=rnewman 2013-01-06 18:23:16 -08:00
Gregory Szorc
4de00c3541 Bug 812608 - Part 2c: Further improvements to shutdown logic; r=rnewman
Now with tests and more logging!
2013-01-06 16:24:50 -08:00
Gregory Szorc
916cfe55d3 Bug 813287 - Move healthreport prefs into greprefs.js; r=rnewman 2013-01-06 16:15:51 -08:00
Gregory Szorc
4c413559a7 Bug 808126 - Crash report collection for Firefox Health Report; r=rnewman 2013-01-06 14:47:18 -08:00
Gregory Szorc
2fcd4cca4a Bug 824528 - Health report provider for collecting add-on info; r=rnewman 2013-01-06 14:40:40 -08:00
Richard Newman
80f9c01483 Bug 812608 - Part 3: further tweaks to profile age fetch. r=trivial 2013-01-06 14:07:34 -08:00
Gregory Szorc
d9d2473ac3 Bug 812608 - Part 2b: More robust shutdown logic; r=rnewman 2013-01-06 13:53:33 -08:00
Gregory Szorc
e79ef1a44f Bug 826893 - Health Report provider for application sessions; r=rnewman 2013-01-06 12:24:26 -08:00
Gregory Szorc
4adf76369c Bug 826580 - Record application version history in Firefox Health Report; r=rnewman 2013-01-06 12:16:05 -08:00
Gregory Szorc
e80c4f1b4d Bug 812608 - Part 2: Refactor FHR on top of new Metrics APIs; r=rnewman
This also includes a lot of revamped Firefox Health Report features. The
payload format has changed. There is now robust service shutdown logic.
There are more prefs to control behavior. It's almost a rewritten
service.
2013-01-06 12:13:27 -08:00
Gregory Szorc
c70c868549 Bug 812608 - Part 1: Persistent storage backend for metrics data; r=rnewman 2013-01-06 12:13:19 -08:00
Gregory Szorc
99cded6018 Bug 718066 - Enable Firefox Health Report in browser app; r=mconnor
This can't land in mozilla-central until the UX pieces land.
2013-01-06 12:09:39 -08:00
Gregory Szorc
36e67f706e Bug 791869 - Remove services/notifications; r=rnewman 2013-01-06 12:04:59 -08:00
Gregory Szorc
bf544fce44 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
Gregory Szorc
46d67de068 Bug 812608 - Part 0: API to (re)define nsIXULAppInfo from unit tests; r=rnewman 2013-01-05 16:10:38 -08:00
Richard Newman
003ba22756 Bug 826421 - Follow-up: remove unnecessary method. r=trivial 2013-01-04 20:03:46 -08:00
Richard Newman
ef731d95ca Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Richard Newman
3cce87fd00 Bug 826086 - Handle errors in asyncOpen. r=gps 2013-01-02 15:40:03 -08:00
Richard Newman
ebc6e187b6 Bug 806494 - Fix resource header copying on internal redirect. r=gps 2013-01-04 22:23:50 -08:00
Richard Newman
1e9245e3b6 Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Mike Hommey
f88193ca6f Bug 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps 2013-01-04 15:56:20 +01:00
Richard Newman
4ab40548ef Bug 696974 - Bookmarks engine: "invalid 'in' operand this._modified" in reconcile. r=gps 2012-12-22 12:44:05 -08:00
Richard Newman
23829f6ab2 Bug 699546 - Log more backoff information: X-Weave-Backoff, Retry-After. r=gps 2012-12-22 11:43:56 -08:00
Richard Newman
c5089e9cc4 Bug 698087 - Remove Service.updatedURL and associated consts. r=gps 2012-12-22 11:43:50 -08:00
Richard Newman
1bd9a0ba60 Merge m-c to s-c. 2012-12-22 11:32:28 -08:00
Richard Newman
9d4d8a6abd Bug 650941 - Use run_next_test in test_resource_ua.js. r=mechanical 2012-12-21 23:22:00 -08:00
Mike Hommey
a7c8ac7075 Backout changeset 6656cdc8b20d (bug 824330) because of android and b2g bustage on clobber builds 2013-01-04 17:14:33 +01:00
Mike Hommey
5a817fd43d Bug 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps 2013-01-04 15:56:20 +01:00
Richard Newman
ad01bb39ea Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:43:58 -08:00
Richard Newman
ae5fa5496d 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
307f125357 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman
9b3f517b2c Merge m-c to s-c. 2012-12-10 13:01:43 -08:00
Richard Newman
72aec78531 Merge m-c to s-c. 2012-12-05 23:59:56 -08:00
Richard Newman
9076f9f878 Merge m-c to s-c. 2012-11-27 21:24:41 -08:00
Richard Newman
cc49ff6914 Merge m-c to s-c. 2012-11-21 09:37:58 -08:00
Richard Newman
ded69051a6 Merge m-c to s-c. 2012-11-19 18:10:54 -08:00
Alex Keybl
649cc92616 Merging in version bump NO BUG 2012-11-19 12:03:27 -08:00
Richard Newman
94f98fa525 Bug 817232 - Don't apply incoming deletions for special folders. r=gps 2012-12-04 16:49:55 -08:00
Richard Newman
9970819944 Bug 718066 - Pref off FHR on all platforms. r=gps 2012-11-19 19:00:58 -08:00
Gregory Szorc
d4633143a9 Bug 812377 - Health report provider for collecting system info; r=rnewman 2012-11-19 13:18:30 -08:00
Gregory Szorc
fc1e767dcf Bug 813226 - Add ability to bypass policy acceptance; r=rnewman
This is needed to support background "always OK" data submission, such
as ADU pings.
2012-11-19 11:31:19 -08:00
Gregory Szorc
0ca010a683 Bug 811159 - Save last submitted health report to profile; r=rnewman 2012-11-16 10:05:19 -08:00
Gregory Szorc
7c16f3f755 Bug 809644 - Health Report provider for application info; r=rnewman 2012-11-12 15:50:04 -08:00
Gregory Szorc
ed77007664 Bug 808219 - Firefox Health Reporter service; r=rnewman 2012-11-13 20:22:09 -08:00
Michal Jaskurzynski
565345c3a0 Bug 424712 - Server location needs a slash at the end. r=rnewman 2012-11-12 09:48:26 -08:00
Gregory Szorc
80740451d8 Bug 810132 - Add remote deletion requests to policy; r=rnewman 2012-11-09 13:59:40 -08:00
Gregory Szorc
21080df09a Bug 809954 - Handle unexpected future dates; r=rnewman 2012-11-09 09:27:00 -08:00
Gregory Szorc
147e22ad30 Bug 809930 - Make metrics provider collection API more robust; r=rnewman 2012-11-08 15:32:49 -08:00
Gregory Szorc
6ec7e06edf Bug 810053 - Add explicit test for obsolete document deletion; r=rnewman 2012-11-08 15:24:56 -08:00
Gregory Szorc
c7d86737ae Bug 802914 - Implement Bagheera client and server; r=rnewman 2012-11-07 16:25:09 -08:00
Gregory Szorc
4a8f70acea Bug 804491 - Data submission policy and scheduling driver for Firefox Health Report; r=rnewman 2012-11-07 16:09:13 -08:00
Gregory Szorc
70bd6015f0 Bug 718067 - Part 3: Add MetricsCollector; r=rnewman 2012-11-05 13:45:35 -08:00
Gregory Szorc
5040395146 Bug 718067 - Part 2: Define types for representing metrics data; r=rnewman 2012-11-05 12:50:11 -08:00
Gregory Szorc
9d46d35ef0 Bug 718067 - Part 1: Create skeletons for services/{metrics,healthreport}; r=rnewman
services/metrics will hold generic metrics code. services/healthreport
report will build on top of that to provide the Firefox Health Report
feature. All functionality will land in subsequent patches.
2012-11-05 12:49:58 -08:00
Gregory Szorc
0fb432e554 Bug 803377 - Add CommonUtils.convertString; r=rnewman 2012-11-06 08:37:53 -08:00
Gregory Szorc
3cf90aee01 Bug 807231 - Add CommonUtils.{getDatePref,setDatePref}; r=rnewman 2012-11-05 12:49:42 -08:00
Gregory Szorc
cae043e902 Bug 806591 - Add CommonUtils.generateUUID utility function; r=rnewman 2012-11-05 12:49:34 -08:00
Richard Newman
e2b248c2fe 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
cd5c2421eb Backout 545cb0d6b5c6 (bug 811490), 4fd6fc029bbe (bug 722977) for xpcshell failures 2012-11-16 19:15:18 +00:00
Andres Hernandez
525815baa3 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
13a04a1089 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
Ed Morley
6ec7e9c66c 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
51a43489a2 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
032788c781 Backout a38692ea87ae (bug 827303) for xpcshell failures on a CLOSED TREE 2013-01-09 23:45:36 +00:00
Mark Banner
3a785a8c2d 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
Kyle Huey
c7f4d895c2 Bug 813766: Set EXPORTED_SYMBOLS on this instead of the global. r=gps 2012-11-26 08:54:17 -08:00
Ehsan Akhgari
4a611f92e3 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
6ab9a36ca6 Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:42:22 -08:00
Richard Newman
2126699ba5 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman
3f259525f3 Bug 808750 - More logging and safety in resource callbacks. r=gps 2012-11-05 17:31:12 -08:00
Richard Newman
5098856c67 Bug 693427 - More logging and fixes for filelog cleanup. r=gps 2012-11-05 16:05:06 -08:00
Jason Orendorff
f0ddf7bbd5 Bug 807001 - Change Map and Set size() methods to accessor properties. r=Waldo.
--HG--
extra : rebase_source : bf2809aa1d943caa6349d7b44621cd1b0bb85742
2012-11-02 10:12:36 -05:00
Richard Newman
98fbd75674 Merge m-c to s-c. 2012-11-01 12:28:15 -07:00
Richard Newman
d2ba658a5a Merge m-c to s-c. 2012-10-31 17:11:26 -07:00
Richard Newman
38d8a32d05 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
741f79754f Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage). 2012-10-29 17:47:04 -07:00
Richard Newman
717259d254 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
2596e53835 Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman
4981c7a585 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
45adfbf2c8 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
85e271bf40 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
e6e6deb486 Backout 67cb43bb8865: Breaks B2G Marionette 2012-10-31 16:35:11 +08:00
Kyle Huey
7457de64ad 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
a7bb0ec116 Backout a145ded68994, e0cf397089ec & 1545e91c658e (bug 798491) for bustage on a CLOSED TREE 2012-10-30 17:02:31 +00:00
Kyle Huey
dd0cfd935a 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
755e644afe 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
482e9f691b Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman
780994aa70 Merge m-c to s-c. 2012-10-12 11:47:24 -07:00
Richard Newman
fedbb19297 Bug 798430 - Copy our set HTTP headers across channel redirects. r=gps 2012-10-10 11:48:16 -07:00
Richard Newman
f3798b2e7c Merge m-c to s-c. 2012-10-08 17:08:01 -07:00
Alex Keybl
7716671921 Merging in version bump NO BUG 2012-10-08 11:01:15 -07:00
Gregory Szorc
c63b8b5035 Bug 800154 - Refactor how services/ integrates with build system; r=glandium
We now have MOZ_SERVICES_COMMON and MOZ_SERVICES_CRYPTO to control
inclusion of services/common and services/crypto, respectively.
2012-10-11 10:34:09 -07:00
Richard Newman
c13185e7f1 Bug 798430 - Copy our set HTTP headers across channel redirects. r=gps 2012-10-10 11:49:21 -07:00
Nick Alexander
b896dabe99 Bug 790822: Make ensureMillisecondsTimestamp convert to integer. r=gps 2012-09-30 18:12:46 -07:00
Gregory Szorc
d80995d66c Merge mozilla-central into services-central 2012-09-25 11:00:01 -07:00
Gregory Szorc
57f832b750 Bug 792546 - Part 5: Clean up excessive imports; r=rnewman 2012-09-24 13:46:19 -07:00
Gregory Szorc
4fd177cc88 Bug 792546 - Part 4: Move utility functions to testing-only JS module; r=rnewman 2012-09-24 13:45:49 -07:00
Gregory Szorc
bd79af95ab Bug 792546 - Part 3: Move logging functions into standalone module; r=rnewman 2012-09-24 13:43:02 -07:00
Gregory Szorc
4738a22baf 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
421a02f52c 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
3b76165d39 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
216e4ddfbc Merge mozilla-central into services-central 2012-09-18 11:37:04 -07:00
Gregory Szorc
4ba0064fe2 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
187933e7d7 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
43c6e1d377 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
98dea330a4 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
48db52e99d 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
d9a82c9c27 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
58bcd2801d 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
Gregory Szorc
c9586f34a5 Bug 787273 - Part 1: Remove Records singleton; r=rnewman
RecordManager is now an instance of the Service singleton and holds a
reference back to the service which is used to obtain needed "global"
state.
2012-09-14 16:02:32 -07:00
Nick Alexander
550ab95c83 Bug 790397: set deleted = false for each record stored via PUT or POST. 2012-09-11 17:22:21 -07:00
Benjamin Peterson
596c02ba13 Bug 782272 - Only clear the _lazySave timer if it's there. r=gps 2012-09-24 17:06:10 -04:00
Gregory Szorc
097529bf10 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:24:24 -07:00
Richard Newman
d8f2ba2e32 Merge m-c to s-c. 2012-08-30 19:26:53 -07:00
Gregory Szorc
892b21e25b Bug 786489 - Part 2: Change username through Identity not prefs; r=rnewman
The preferred way to change the username is through the Identity
singleton, not by updating a pref and hoping the side-effect is what you
want.
2012-08-29 14:43:41 -07:00
Gregory Szorc
5f41f9020f Bug 786489 - Part 1: Update serverURL and clusterURL through Service; r=rnewman
The preferred method to update serverURL and clusterURL is by going
through the SyncService Service singleton, not by setting preferences.
2012-08-29 14:43:41 -07:00
Gregory Szorc
ae2a788f16 Bug 785225 - Part 11: Burninate trailing whitespace from tests; r=rnewman 2012-08-29 14:43:41 -07:00
Gregory Szorc
cacfe5c26b Bug 785225 - Part 10: Reflect API changes in TPS; r=rnewman
The previous parts broke TPS. This fixes them all in one lump patch.
2012-08-29 14:43:41 -07:00
Gregory Szorc
45d3f90cf3 Bug 785225 - Part 9: Refactor engines to not use singletons; r=rnewman
Engines now maintain a reference to the service they belong to. This
allows them to obtain references to other engine instances belonging to
that service and that service only.

Stores and trackers now maintain a reference to the engine they belong
to.

Engine managers now maintain a reference back to a service.

The clients singleton has been removed. It now exists as an instance
variable on Service. Parts of ClientsEngine do behave as singletons
(e.g. commands). This will be addressed in future refactoring.
2012-08-29 14:43:41 -07:00
Gregory Szorc
88f9794fe7 Bug 785225 - Part 8: Don't expose SyncScheduler as a singleton; r=rnewman 2012-08-29 14:43:41 -07:00
Gregory Szorc
db187465ed Bug 785225 - Part 7: Bind SendCredentialsController to a Service instance; r=rnewman 2012-08-29 14:43:40 -07:00
Gregory Szorc
5628a0cd3b Bug 785225 - Park 6: Move StorageCredentialsController to jpakeclient.js; r=rnewman
I'm not sure why it was in policies.js, as it has everything to do with
J-PAKE exchange.
2012-08-29 14:43:40 -07:00
Gregory Szorc
bb5d240869 Bug 785225 - Part 5: Partial removal of Clients singleton; r=rnewman
Clients was being exported and used as a singleton. We still use Clients
as a singleton in some places, but only in test code. The preferred
method to access Clients is now through a service instance.
Weave.Clients is no longer exposed. Callers go through Weave.Service
now.
2012-08-29 14:43:40 -07:00
Gregory Szorc
57684fd336 Bug 785225 - Part 4: Remove unused exports from Weave; change engine loading; r=rnewman
Lots of exports from the Weave global object weren't being used. This
also changes how engines are loaded. There is now a mapping in
service.js of engine name to filename. Before, it was looking at Weave.
2012-08-29 14:43:40 -07:00
Gregory Szorc
b11d37e791 Bug 785225 - Part 3: Don't expose ErrorHandler as a singleton; r=rnewman
Some tests still expect there to only be a single instance of
ErrorHandler for the life of the tests. And, ErrorHandler itself is
pretty tighly coupled with being a singleton because it writes out
changes to prefs, etc. But, it's a step in the right direction.
2012-08-29 14:43:40 -07:00
Gregory Szorc
50628a23db Bug 785225 - Part 2: Minimize Engines singleton usage; r=rnewman
Weave.Engines is no longer exported. Service now exposes an
EngineManager instance, which is the new recommended way to get at the
engine manager. Service was updated to reference the internal instance.
2012-08-29 14:43:40 -07:00
Gregory Szorc
cf876cf19b Bug 785225 - Part 1: Don't rely on Engines singleton in AddonsReconciler; r=rnewman 2012-08-29 14:43:40 -07:00
Gregory Szorc
512b106c9a Bug 783721 - Refactor User API service interaction; r=rnewman 2012-08-29 14:43:39 -07:00
Gregory Szorc
3515fa2af2 Bug 783437 - Add conditions acceptance to token server client; r=rnewman 2012-08-28 13:34:33 -07:00
Gregory Szorc
3ec3ede5db Merge mozilla-central into services-central 2012-08-27 12:56:17 -07:00
Alex Keybl
b3319338f9 Merging in version bump NO BUG 2012-08-27 12:21:46 -07:00
Ally Naaktgeboren
e2dc01a32c Bug 589468 - Part 2/2: Change "computer" to "device" in all strings regarding desktop Firefox Sync. r=mconnor
--HG--
extra : rebase_source : 1041808123507a278b6bbddf7d387d6ef18ccfcd
2012-08-29 17:09:32 -07:00
Jim Mathies
29babf1a23 Bug 784165 - Metrofx should use a new appid. r=gavin 2012-09-13 12:29:08 -05:00
Allison Naaktgeboren
a7be27abcd Bug 644734; r=gps 2012-09-12 15:08:07 -07:00
Jim Mathies
69aa589ced Bug 817076 - Update various services paths to point to the gre. r=gps 2012-12-05 16:36:27 -06:00
Ehsan Akhgari
f111e7c0fb Merge mozilla-central into mozilla-inbound 2012-11-19 17:07:53 -05:00
Andres Hernandez
d4700cbcf9 Bug 811490 - Convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode; r=ehsan,rnewman 2012-11-15 18:33:31 -06:00
Andres Hernandez
7141c6595b Bug 722977 - Tabs engine uses global Svc.Private to make decisions based on private browsing state; r=ehsan,gps,rnewman 2012-11-19 14:44:07 -06:00
Josh Matthews
44336d0465 Bug 723002 - Determine privacy status from provided nsILoadContext in ContentPrefService. r=ehsan 2012-06-30 07:50:07 -07:00
David Rajchenbach-Teller
97fa5e80b7 Bug 772211 - Get rid of some uses of addVisit. r=mak77, r=rnewman 2013-01-08 19:40:06 -05:00
Gregory Szorc
78da7d80a6 Merge mozilla-central into services-central 2012-08-20 09:34:02 -07:00
Gregory Szorc
c40d37853c Merge mozilla-central into services-central 2012-08-15 16:24:21 -07:00
Gregory Szorc
70ae3d2aef Bug 781952 - Part 3: Remove unused Service._updateCluster; r=rnewman 2012-08-14 11:34:28 -07:00
Gregory Szorc
46d44b7e4f Bug 781952 - Part 2: Move cluster management out of service.js; r=rnewman 2012-08-14 11:34:20 -07:00
Gregory Szorc
02c00a0d0b Bug 781952 - Part 1: Refactor engine syncing logic out of service.js; r=rnewman 2012-08-14 11:34:14 -07:00
Gregory Szorc
79239ec0c0 Bug 781946 - Clean up notifications usage; r=rnewman 2012-08-13 16:51:58 -07:00
Gregory Szorc
b2d302b359 Bug 618233 - Re-disable test_jpakeclient.js on Windows for oranges; r=rnewman 2012-08-13 10:29:28 -07:00
Gregory Szorc
33cea93fa9 Bug 781307 - Remove rules from services/ Makefile.in's; r=glandium 2012-08-09 13:12:29 -07:00
Gregory Szorc
c588503c5f Bug 759487 - Refactor services/sync/Makefile.in; r=glandium 2012-08-09 13:12:26 -07:00
Gregory Szorc
ca4707e2b9 Bug 618233 - Enable test_jpakeclient.js on Windows; r=rnewman
May trigger intermittent oranges. Trying to reproduce so we can triage.
2012-08-08 16:43:05 -07:00
Gregory Szorc
a452894077 Bug 781348 - Style improvements to service.js; r=rnewman 2012-08-08 16:35:37 -07:00
Gavin Sharp
fbc4810ec7 Bug 781323: fix about:sync-log, r=gps
--HG--
extra : rebase_source : 168339ad89dd0263b83deb7d9b028d59562cffe0
2012-08-14 15:37:04 -04:00
Mike Hommey
c1b35e7b2a Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Gregory Szorc
a23b2c0485 Bug 779589 - Move services/common testing-only JS modules into own directory; r=rnewman
--HG--
rename : services/common/aitcserver.js => services/common/modules-testing/aitcserver.js
rename : services/common/storageserver.js => services/common/modules-testing/storageserver.js
2012-08-01 13:50:55 -07:00
Gregory Szorc
cd1c493cc9 Bug 779391 - Move deepCopy into CommonUtils; r=rnewman 2012-08-01 12:05:29 -07:00
Gregory Szorc
190cd28d00 Bug 777989 - Make Add-on sync TPS tests work again; r=rnewman 2012-08-01 12:02:48 -07:00
Gregory Szorc
3d8e904740 Bug 777989 - Update TPS to use new AddonUtils module; r=rnewman 2012-07-31 18:12:12 -07:00
Gregory Szorc
b5da03f768 Bug 777989 - Move add-on helper functions out of add-ons engine; r=rnewman 2012-07-30 17:05:33 -07:00
Sankha Narayan Guria
3dc82e3bf5 Bug 579604 - Save prefs file after setting up Sync; r=gps 2012-07-30 16:05:20 -07:00
Richard Newman
a0c75403bc Merge m-c to s-c. 2012-07-30 13:04:40 -07:00
Aryeh Gregor
57c0ad57fb Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Richard Newman
6999d209a9 Bug 762606 - Another attempt at stopping tests finishing too soon. r=orange 2012-07-28 18:19:27 -07:00
Richard Newman
557a8e3c6c Bug 762606 - Intermittent test_resource_async.js | test failed (again). r=gps 2012-07-26 14:01:43 -07:00
Gregory Szorc
a85d93e1e6 Merge mozilla-central into services-central 2012-07-25 11:20:58 -07:00
Gregory Szorc
3eba596963 Bug 769500 - Followup to fix timing-related intermittent orange; r=bustage 2012-07-24 22:15:16 -07:00
Gregory Szorc
8991d0858b Bug 776778 - Followup to fix intermittent orange; r=bustage 2012-07-24 22:06:59 -07:00
Gregory Szorc
88279dc57a Bug 776778 - Implement X-If-Unmodified-Since on GET method; r=rnewman
This reflects changes to the spec in bug 776768.
2012-07-24 16:51:48 -07:00
Gregory Szorc
a19001e79d Bug 776771 - Remove index_above and index_below from storage service; r=rnewman
Removed from spec in bug 775395.
2012-07-24 11:44:04 -07:00
Gregory Szorc
8a189d7d64 Bug 776770 - Remove newline encoding from storage service server; r=rnewman
Functionality removed from spec in bug 775798.
2012-07-24 11:43:57 -07:00
Gregory Szorc
b8ae60217f Merge mozilla-central into services-central 2012-07-24 10:08:45 -07:00
Gregory Szorc
38d2decfa7 Bug 769500 - Add batching APIs to storage service client; r=rnewman 2012-07-23 16:46:38 -07:00
Gregory Szorc
99a51693fc Bug 775216 - Percent decode query string members; r=rnewman 2012-07-23 16:39:28 -07:00
Richard Newman
1229df592e Bug 763973 - Intermittent test_resource_async.js | test failed (with xpcshell return code: 0) | false == true. r=gps 2012-07-24 19:55:48 -07:00
Mounir Lamouri
9e75d782c9 Bug 775829 - Use the new Permission Manager API in Browser ID. r=sicking 2012-07-20 18:09:12 -07:00
Joshua Cranmer
e1cdfe2f05 Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan
--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
2012-07-06 15:14:07 -05:00
Gregory Szorc
c727c2d588 Bug 775287 - Track request count in storage server; r=rnewman 2012-07-20 12:00:39 -07:00
Patrick McManus
7a2776aa29 bug 770331 - always try and negotiate HTTP Keep-Alive r=biesi
--HG--
extra : rebase_source : d348e3ec56faa48fbed5c4f0f697dee6658e21b2
2012-07-20 08:40:13 -04:00
Jonas Sicking
644f038064 Bug 774585: Make about: redirectors reset channel owner to null rather than set an explicit principal so that we'll go through the normal code paths in GetChannelPrincipal. r=bz 2012-07-17 22:22:19 -07:00
Gregory Szorc
7bc575b423 Bug 774736 - Move Sync's version to Makefile.in; general cleanup; r=glandium 2012-07-17 10:45:13 -07:00
Tim Taubert
4f66306ec3 merge m-c to fx-team 2012-08-16 11:10:41 -07:00
Dave Townsend
6c649be569 Bug 793928: Switch users of the promise library to the new location and move tests files. r=gavin
--HG--
rename : toolkit/addon-sdk/test/Makefile.in => addon-sdk/test/Makefile.in
rename : toolkit/addon-sdk/test/unit/head.js => addon-sdk/test/unit/head.js
rename : toolkit/addon-sdk/test/unit/test_promise.js => addon-sdk/test/unit/test_promise.js
rename : toolkit/addon-sdk/test/unit/xpcshell.ini => addon-sdk/test/unit/xpcshell.ini
2013-02-01 11:43:15 -08:00
Ed Morley
108f990d77 Bug 752243 - Disable test_service_wipeServer.js, test_service_createAccount.js, test_service_changePassword.js, test_aitc_server.js, test_aitc_client.js & test_hashcompleter.js on OS X & Linux for too many intermittent failures 2012-12-13 12:48:42 +00:00
Richard Newman
5f1e241a81 Bug 807842 - FHR provider: profile metadata. r=gps 2012-12-11 15:13:00 -08:00
Dave Townsend
7a602435d3 Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
2012-05-10 11:33:02 -07:00
Blair McBride
36643cef64 Backout 42bc5a310a29 (bug 782881) due to multi-orange. 2012-08-15 23:07:45 +12:00
Dave Townsend
2182723b6e Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused 2012-05-10 11:33:02 -07:00
Gregory Szorc
8d1288c75f Bug 783437 - Add conditions acceptance to token server client; r=rnewman 2012-08-28 13:34:33 -07:00
Gregory Szorc
1e1e233a46 Backout 66a9982a4bc9 (bug 760902) for frequent orange 2012-07-13 23:15:21 -07:00
Anant Narayanan
deef37b5bc Bug 760902: Add test for AITC manager GET timer; r=gps 2012-07-13 20:00:09 -07:00
Anant Narayanan
f3d398132f Bug 761045: Upload locally installed apps on first run; r=gps 2012-07-13 19:52:30 -07:00
Nick Desaulniers
aced0a97c4 Bug 760910: Handle 401 responses correctly in AITC; r=gps 2012-07-05 09:32:07 -07:00
Anant Narayanan
8208b16f0a Bug 772191 - Change default stream encoding of RESTRequest to utf-8; r=philikon 2012-07-13 16:52:31 -07:00
Gregory Szorc
6fb5362a8f Bug 760895 - Rewrite reconciling algorithm for AITC; r=mconnor 2012-07-13 16:25:08 -07:00
Nick Desaulniers
676ea21d6d Bug 760909: Implement client driven backoff for AITC; r=gps 2012-07-02 14:57:16 -07:00
Anant Narayanan
b3525e1fd2 Bug 773717: browserid.org now redirects to login.persona.org; r=gps 2012-07-13 14:03:42 -07:00
Nick Desaulniers
045ce0d2ee Bug 760909 - Add onRequest and mock response handling to AITC server; r=gps 2012-07-12 16:52:58 -07:00
Harald Kirschner
35321a3d3e Bug 750948 - Implement unit tests for AitC client against mock server; r=gps 2012-06-25 16:39:39 -07:00
Benjamin Peterson
da659fcf4b Bug 722956: clear async io timer, so it doesn't run after shutdown has started. r=philkon 2012-07-12 16:36:41 -07:00
Gregory Szorc
52fde36de4 Merge mozilla-central into services-central 2012-07-12 12:10:52 -07:00
Gregory Szorc
e1fe939f19 Bug 772569 - Remove do_load_httpd_js from services test code; r=rnewman 2012-07-10 11:54:12 -07:00
Gregory Szorc
3bd6eb3017 Merge mozilla-central into services-central 2012-07-10 10:22:21 -07:00
Ryan VanderMeulen
21daf52e96 Merge the last PGO-green inbound changeset to m-c. 2012-07-09 20:59:12 -04:00
Gregory Szorc
058a04d0c1 Bug 769816 - Send newline-delimited requests instead of JSON; r=rnewman 2012-07-09 15:24:46 -07:00