Backed out changeset e427eb78d33b (bug 1250958) for test failures

MozReview-Commit-ID: 7IVwDpqXf7D

browser/components/places/tests/browser/browser.ini

@@ -46,6 +46,7 @@ skip-if = e10s # Bug ?????? - test fails - "Number of dragged items should be th
 [browser_library_search.js]
 [browser_library_views_liveupdate.js]
 [browser_markPageAsFollowedLink.js]
+skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly (test does EventUtils.sendMouseEvent...)
 [browser_sidebarpanels_click.js]
 skip-if = true # temporarily disabled for breaking the treeview - bug 658744
 [browser_sort_in_library.js]

browser/components/places/tests/browser/browser_markPageAsFollowedLink.js

@@ -1,3 +1,7 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
 /**
  * Tests that visits across frames are correctly represented in the database.
  */
@@ -7,55 +11,76 @@ const PAGE_URL = BASE_URL + "/framedPage.html";
 const LEFT_URL = BASE_URL + "/frameLeft.html";
 const RIGHT_URL = BASE_URL + "/frameRight.html";
 
-add_task(function* test() {
-  // We must wait for both frames to be loaded and the visits to be registered.
-  let deferredLeftFrameVisit = PromiseUtils.defer();
-  let deferredRightFrameVisit = PromiseUtils.defer();
+var gTabLoaded = false;
+var gLeftFrameVisited = false;
 
-  Services.obs.addObserver(function observe(subject) {
-    Task.spawn(function* () {
-      let url = subject.QueryInterface(Ci.nsIURI).spec;
-      if (url == LEFT_URL ) {
-        is((yield getTransitionForUrl(url)), null,
-           "Embed visits should not get a database entry.");
-        deferredLeftFrameVisit.resolve();
-      }
-      else if (url == RIGHT_URL ) {
-        is((yield getTransitionForUrl(url)),
-           PlacesUtils.history.TRANSITION_FRAMED_LINK,
-           "User activated visits should get a FRAMED_LINK transition.");
-        Services.obs.removeObserver(observe, "uri-visit-saved");
-        deferredRightFrameVisit.resolve();
-      }
-    });
-  }, "uri-visit-saved", false);
+var observer = {
+  observe: function(aSubject, aTopic, aData)
+  {
+    let url = aSubject.QueryInterface(Ci.nsIURI).spec;
+    if (url == LEFT_URL ) {
+      is(getTransitionForUrl(url), null,
+         "Embed visits should not get a database entry.");
+      gLeftFrameVisited = true;
+      maybeClickLink();
+    }
+    else if (url == RIGHT_URL ) {
+      is(getTransitionForUrl(url), PlacesUtils.history.TRANSITION_FRAMED_LINK,
+         "User activated visits should get a FRAMED_LINK transition.");
+      finish();
+    }
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+};
+Services.obs.addObserver(observer, "uri-visit-saved", false);
 
-  let tab = gBrowser.selectedTab = gBrowser.addTab(PAGE_URL);
-  // Wait for all the subframes loads.
-  yield BrowserTestUtils.browserLoaded(tab.linkedBrowser, true);
-  // wait for the left frame visit to be registered;
-  yield deferredLeftFrameVisit.promise;
-
-  // Click on the link in the left frame to cause a page load in the
-  // right frame.
-  yield BrowserTestUtils.synthesizeMouseAtCenter(
-    () => content.frames[0].document.getElementById("clickme"), {}, tab.linkedBrowser);
-
-  // wait for the right frame visit to be registered;
-  yield deferredRightFrameVisit.promise;
-
-  yield BrowserTestUtils.removeTab(tab);
-});
-
-function* getTransitionForUrl(url) {
-  let db = yield PlacesUtils.promiseDBConnection();
-  let rows = yield db.execute(`
-    SELECT visit_type
-    FROM moz_historyvisits
-    WHERE place_id = (SELECT id FROM moz_places WHERE url = :url)`,
-    { url });
-  if (rows.length) {
-    return rows[0].getResultByName("visit_type");
-  }
-  return null;
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab(PAGE_URL);
+  let frameCount = 0;
+  gBrowser.selectedBrowser.addEventListener("DOMContentLoaded",
+    function (event)
+    {
+      // Wait for all the frames.
+      if (frameCount++ < 2)
+        return;
+      gBrowser.selectedBrowser.removeEventListener("DOMContentLoaded", arguments.callee, false)
+      gTabLoaded = true;
+      maybeClickLink();
+    }, false
+  );
 }
+
+function maybeClickLink() {
+  if (gTabLoaded && gLeftFrameVisited) {
+    // Click on the link in the left frame to cause a page load in the
+    // right frame.
+    EventUtils.sendMouseEvent({type: "click"}, "clickme", content.frames[0]);
+  }
+}
+
+function getTransitionForUrl(aUrl)
+{
+  let dbConn = PlacesUtils.history
+                          .QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
+  let stmt = dbConn.createStatement(
+    "SELECT visit_type FROM moz_historyvisits WHERE place_id = " +
+      "(SELECT id FROM moz_places WHERE url = :page_url)");
+  stmt.params.page_url = aUrl;
+  try {
+    if (!stmt.executeStep()) {
+      return null;
+    }
+    return stmt.row.visit_type;
+  }
+  finally {
+    stmt.finalize();
+  }
+}
+
+registerCleanupFunction(function ()
+{
+  gBrowser.removeTab(gBrowser.selectedTab);
+  Services.obs.removeObserver(observer, "uri-visit-saved");
+})

browser/modules/ContentClick.jsm

@@ -63,14 +63,16 @@ var ContentClick = {
 
     // This part is based on handleLinkClick.
     var where = window.whereToOpenLink(json);
+    if (where == "current")
+      return;
+
     // Todo(903022): code for where == save
-    if (where != "current") {
-      let params = { charset: browser.characterSet,
-                     referrerURI: browser.documentURI,
-                     referrerPolicy: json.referrerPolicy,
-                     noReferrer: json.noReferrer };
-      window.openLinkIn(json.href, where, params);
-    }
+
+    let params = { charset: browser.characterSet,
+                   referrerURI: browser.documentURI,
+                   referrerPolicy: json.referrerPolicy,
+                   noReferrer: json.noReferrer };
+    window.openLinkIn(json.href, where, params);
 
     // Mark the page as a user followed link.  This is done so that history can
     // distinguish automatic embed visits from user activated ones.  For example