Backout bug 615991, since it did not bring the expected results.

a=sdwilsh-over-irc

toolkit/components/places/src/nsNavHistory.cpp

@@ -496,12 +496,6 @@ nsNavHistory::Init()
   rv = InitAdditionalDBItems();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Since some of the APIs are styll synchronous, we need to synchronously get
-  // the sessionId from the database, for visits addition.  The first visit
-  // addition could lock with this synchronous read, thus we query the database
-  // now.  Next calls to GetNewSessionID() will get a incremented cached value.
-  (void)GetNewSessionID();
-
   // Notify we have finished database initialization.
   // Enqueue the notification, so if we init another service that requires
   // nsNavHistoryService we don't recursive try to get it.

toolkit/components/places/tests/network/test_history_redirects.js

@@ -20,6 +20,8 @@ HTTPSVR.registerPathHandler(PERMA_REDIR_PATH, permaRedirHandler);
 HTTPSVR.registerPathHandler(TEMP_REDIR_PATH, tempRedirHandler);
 HTTPSVR.registerPathHandler(FOUND_PATH, foundHandler);
 
+const EXPECTED_SESSION_ID = 1;
+
 const STATUS = {
   REDIRECT_PERMANENT: [301, "Moved Permanently"],
   REDIRECT_TEMPORARY: [302, "Moved"],
@@ -83,17 +85,17 @@ function continue_test() {
       url: PERMA_REDIR_URL,
       from_visit: 0,
       visit_type: Ci.nsINavHistoryService.TRANSITION_LINK,
-      session: 2 },
+      session: EXPECTED_SESSION_ID },
     { id: 2,
       url: TEMP_REDIR_URL,
       from_visit: 1,
       visit_type: Ci.nsINavHistoryService.TRANSITION_REDIRECT_PERMANENT,
-      session: 2 },
+      session: EXPECTED_SESSION_ID },
     { id: 3,
       url: FOUND_URL,
       from_visit: 2,
       visit_type: Ci.nsINavHistoryService.TRANSITION_REDIRECT_TEMPORARY,
-      session: 2 },
+      session: EXPECTED_SESSION_ID },
   ];
   try {
     while(stmt.executeStep()) {