Issue #21 - Remove TelemertyVFS

This reverts m-c Bug 668378 and completely removes Telemetry SQLite IO. As a bonus this fixes a potential crash in newer SQLite versions without the need for updating this useless telemetry shim.

2 files changed, 0 insertions, 31 deletions

diff --git a/storage/test/unit/test_telemetry_vfs.js b/storage/test/unit/test_telemetry_vfs.js
deleted file mode 100644
index 0822fe3e7..000000000
--- a/storage/test/unit/test_telemetry_vfs.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Make sure that there are telemetry entries created by sqlite io
-
-function run_sql(d, sql) {
-  var stmt = d.createStatement(sql);
-  stmt.execute();
-  stmt.finalize();
-}
-
-function new_file(name)
-{
-  var file = dirSvc.get("ProfD", Ci.nsIFile);
-  file.append(name);
-  return file;
-}
-function run_test()
-{
-  const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
-  let read_hgram = Telemetry.getHistogramById("MOZ_SQLITE_OTHER_READ_B");
-  let old_sum = read_hgram.snapshot().sum;
-  const file = new_file("telemetry.sqlite");
-  var d = getDatabase(file);
-  run_sql(d, "CREATE TABLE bloat(data varchar)");
-  run_sql(d, "DROP TABLE bloat");
-  do_check_true(read_hgram.snapshot().sum > old_sum);
-}
-
diff --git a/storage/test/unit/xpcshell.ini b/storage/test/unit/xpcshell.ini
index e93c7d5b9..f9075a595 100644
--- a/storage/test/unit/xpcshell.ini
+++ b/storage/test/unit/xpcshell.ini
@@ -41,6 +41,5 @@ fail-if = os == "android"
 [test_storage_value_array.js]
 [test_unicode.js]
 [test_vacuum.js]
-[test_telemetry_vfs.js]
 # Bug 676981: test fails consistently on Android
 # fail-if = os == "android"