backout merge

toolkit/components/places/tests/mochitest/bug_411966/redirect.js

@@ -163,11 +163,11 @@ function checkDBOnTimeout() {
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
   // Get all pages visited from the original typed one
-  var sql = "SELECT url FROM moz_historyvisits_view " +
-            "JOIN moz_places_view h ON h.id = place_id " +
+  var sql = "SELECT url FROM moz_historyvisits " +
+            "JOIN moz_places h ON h.id = place_id " +
             "WHERE from_visit IN " +
-              "(SELECT v.id FROM moz_historyvisits_view v " +
-              "JOIN moz_places_view p ON p.id = v.place_id " +
+              "(SELECT v.id FROM moz_historyvisits v " +
+              "JOIN moz_places p ON p.id = v.place_id " +
               "WHERE p.url = ?1)";
   var stmt = mDBConn.createStatement(sql);
   stmt.bindUTF8StringParameter(0, typedURI.spec);