Bug 1289785 - Remove entry.owner_b64 from SessionStore.js and SessionHistory.jsm. r=ckerschb, r=mdeboer
authorHimanshi Jain <himshijain.hj@gmail.com>
Mon, 17 Oct 2016 14:38:13 +0530
changeset 372970 2afcab6fc172a8f7121abd24205f3ab354d54733
parent 372950 a62ce221207c4db6f542426a68cfa0dbb91d118c
child 372971 4622214d532bfb6a18b0c2273dd8fe9091142cd1
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersckerschb, mdeboer
bugs1289785
milestone54.0a1
Bug 1289785 - Remove entry.owner_b64 from SessionStore.js and SessionHistory.jsm. r=ckerschb, r=mdeboer
browser/components/sessionstore/SessionHistory.jsm
mobile/android/components/SessionStore.js
--- a/browser/components/sessionstore/SessionHistory.jsm
+++ b/browser/components/sessionstore/SessionHistory.jsm
@@ -405,24 +405,16 @@ var SessionHistoryInternal = {
         docIdentMap[entry.docIdentifier] = matchingEntry;
       }
       else {
         shEntry.adoptBFCacheEntry(matchingEntry.shEntry);
         childDocIdents = matchingEntry.childDocIdents;
       }
     }
 
-    // The field entry.owner_b64 got renamed to entry.triggeringPricipal_b64 in
-    // Bug 1286472. To remain backward compatible we still have to support that
-    // field for a few cycles before we can remove it within Bug 1289785.
-    if (entry.owner_b64) {
-      entry.triggeringPricipal_b64 = entry.owner_b64;
-      delete entry.owner_b64;
-    }
-
     // Before introducing the concept of principalToInherit we only had
     // a triggeringPrincipal within every entry which basically is the
     // equivalent of the new principalToInherit. To avoid compatibility
     // issues, we first check if the entry has entries for
     // triggeringPrincipal_base64 and principalToInherit_base64. If not
     // we fall back to using the principalToInherit (which is stored
     // as triggeringPrincipal_b64) as the triggeringPrincipal and
     // the principalToInherit.
--- a/mobile/android/components/SessionStore.js
+++ b/mobile/android/components/SessionStore.js
@@ -1407,24 +1407,16 @@ SessionStore.prototype = {
         matchingEntry = {shEntry: shEntry, childDocIdents: childDocIdents};
         aDocIdentMap[aEntry.docIdentifier] = matchingEntry;
       } else {
         shEntry.adoptBFCacheEntry(matchingEntry.shEntry);
         childDocIdents = matchingEntry.childDocIdents;
       }
     }
 
-    // The field aEntry.owner_b64 got renamed to aEntry.triggeringPricipal_b64 in
-    // Bug 1286472. To remain backward compatible we still have to support that
-    // field for a few cycles before we can remove it within Bug 1289785.
-    if (aEntry.owner_b64) {
-      aEntry.triggeringPricipal_b64 = aEntry.owner_b64;
-      delete aEntry.owner_b64;
-    }
-
     // Before introducing the concept of principalToInherit we only had
     // a triggeringPrincipal within every entry which basically is the
     // equivalent of the new principalToInherit. To avoid compatibility
     // issues, we first check if the entry has entries for
     // triggeringPrincipal_base64 and principalToInherit_base64. If not
     // we fall back to using the principalToInherit (which is stored
     // as triggeringPrincipal_b64) as the triggeringPrincipal and
     // the principalToInherit.