Creating sesion cookie if expiry is not set. Fixes issue 6834

Author: barancev

javascript/firefox-driver/js/firefoxDriver.js

@@ -666,8 +666,10 @@ FirefoxDriver.prototype.refresh = function(respond) {
 
 FirefoxDriver.prototype.addCookie = function(respond, parameters) {
   var cookie = parameters.cookie;
+  var inSession = false;
 
   if (!cookie.expiry) {
+    inSession = true;
     var date = new Date();
     date.setYear(2030);
     cookie.expiry = date.getTime() / 1000;  // Stored in seconds.
@@ -701,16 +703,8 @@ FirefoxDriver.prototype.addCookie = function(respond, parameters) {
   var cookieManager =
       fxdriver.moz.getService('@mozilla.org/cookiemanager;1', 'nsICookieManager2');
 
-  // The signature for "add" is different in firefox 3 and 2. We should sniff
-  // the browser version and call the right version of the method, but for now
-  // we'll use brute-force.
-  try {
-    cookieManager.add(cookie.domain, cookie.path, cookie.name, cookie.value,
-        cookie.secure, false, cookie.expiry);
-  } catch (e) {
-    cookieManager.add(cookie.domain, cookie.path, cookie.name, cookie.value,
-        cookie.secure, false, false, cookie.expiry);
-  }
+  cookieManager.add(cookie.domain, cookie.path, cookie.name, cookie.value,
+      cookie.secure, false, inSession, cookie.expiry);
 
   respond.send();
 };