Bug 1475065 part 8. Remove nsIDOMOfflineResourceList::GetStatus. r=nika

dom/interfaces/offline/nsIDOMOfflineResourceList.idl

@@ -13,8 +13,6 @@ interface nsIDOMOfflineResourceList : nsISupports
    */
   readonly attribute nsISupports mozItems;
 
-  readonly attribute unsigned short status;
-
   /**
    * Begin the application update process on the associated application cache.
    */

dom/offline/nsDOMOfflineResourceList.cpp

@@ -485,8 +485,8 @@ nsDOMOfflineResourceList::MozRemove(const nsAString& aURI, ErrorResult& aRv)
   }
 }
 
-NS_IMETHODIMP
-nsDOMOfflineResourceList::GetStatus(uint16_t *aStatus)
+uint16_t
+nsDOMOfflineResourceList::GetStatus(ErrorResult& aRv)
 {
   nsresult rv = Init();
 
@@ -495,35 +495,35 @@ nsDOMOfflineResourceList::GetStatus(uint16_t *aStatus)
   // to an UNCACHED.
   if (rv == NS_ERROR_DOM_INVALID_STATE_ERR ||
       !nsContentUtils::OfflineAppAllowed(mDocumentURI)) {
-    *aStatus = OfflineResourceList_Binding::UNCACHED;
-    return NS_OK;
+    return OfflineResourceList_Binding::UNCACHED;
   }
 
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    aRv.Throw(rv);
+    return 0;
+  }
 
   // If this object is not associated with a cache, return UNCACHED
   nsCOMPtr<nsIApplicationCache> appCache = GetDocumentAppCache();
   if (!appCache) {
-    *aStatus = OfflineResourceList_Binding::UNCACHED;
-    return NS_OK;
+    return OfflineResourceList_Binding::UNCACHED;
   }
 
 
   // If there is an update in process, use its status.
   if (mCacheUpdate && mExposeCacheUpdateStatus) {
-    rv = mCacheUpdate->GetStatus(aStatus);
-    if (NS_SUCCEEDED(rv) && *aStatus != OfflineResourceList_Binding::IDLE) {
-      return NS_OK;
+    uint16_t status;
+    rv = mCacheUpdate->GetStatus(&status);
+    if (NS_SUCCEEDED(rv) && status != OfflineResourceList_Binding::IDLE) {
+      return status;
     }
   }
 
   if (mAvailableApplicationCache) {
-    *aStatus = OfflineResourceList_Binding::UPDATEREADY;
-    return NS_OK;
+    return OfflineResourceList_Binding::UPDATEREADY;
   }
 
-  *aStatus = mStatus;
-  return NS_OK;
+  return mStatus;
 }
 
 NS_IMETHODIMP

dom/offline/nsDOMOfflineResourceList.h

@@ -68,12 +68,8 @@ public:
   virtual JSObject*
   WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  uint16_t GetStatus(ErrorResult& aRv)
-  {
-    uint16_t status = 0;
-    aRv = GetStatus(&status);
-    return status;
-  }
+  uint16_t GetStatus(ErrorResult& aRv);
+
   void Update(ErrorResult& aRv)
   {
     aRv = Update();