diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/unit/test_463863.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/unit/test_463863.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,60 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*
+ * TEST DESCRIPTION:
+ *
+ * This test checks that in a basic history query all transition types visits
+ * appear but TRANSITION_EMBED and TRANSITION_FRAMED_LINK ones.
+ */
+
+let transitions = [
+  TRANSITION_LINK
+, TRANSITION_TYPED
+, TRANSITION_BOOKMARK
+, TRANSITION_EMBED
+, TRANSITION_FRAMED_LINK
+, TRANSITION_REDIRECT_PERMANENT
+, TRANSITION_REDIRECT_TEMPORARY
+, TRANSITION_DOWNLOAD
+];
+
+function runQuery(aResultType) {
+  let options = PlacesUtils.history.getNewQueryOptions();
+  options.resultType = aResultType;
+  let root = PlacesUtils.history.executeQuery(PlacesUtils.history.getNewQuery(),
+                                              options).root;
+  root.containerOpen = true;
+  let cc = root.childCount;
+  do_check_eq(cc, transitions.length - 2);
+
+  for (let i = 0; i < cc; i++) {
+    let node = root.getChild(i);
+    // Check that all transition types but EMBED and FRAMED appear in results
+    do_check_neq(node.uri.substr(6,1), TRANSITION_EMBED);
+    do_check_neq(node.uri.substr(6,1), TRANSITION_FRAMED_LINK);
+  }
+  root.containerOpen = false;
+}
+
+function run_test()
+{
+  run_next_test();
+}
+
+add_task(function test_execute()
+{
+  // add visits, one for each transition type
+  for (let [, transition] in Iterator(transitions)) {
+    yield promiseAddVisits({
+      uri: uri("http://" + transition + ".mozilla.org/"),
+      transition: transition
+    });
+  }
+
+  runQuery(Ci.nsINavHistoryQueryOptions.RESULTS_AS_VISIT);
+  runQuery(Ci.nsINavHistoryQueryOptions.RESULTS_AS_URI);
+});