From f0e5ba672cc07ca9f34f51af531a38934903c1e9 Mon Sep 17 00:00:00 2001
From: Tejas Srinivasan <tejas.srinivasan95@gmail.com>
Date: Wed, 14 Jan 2015 23:59:00 -0500
Subject: [PATCH] Bug 1120652 - Remove MainThreadFetchResolver::OnResponseEnd()
 and provide an empty definition in the parent class FetchDriverObserver.
 r=nsm

---
 dom/fetch/Fetch.cpp     | 11 -----------
 dom/fetch/FetchDriver.h |  3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
index cf0f2753e098..f3f2fa8afe5b 100644
--- a/dom/fetch/Fetch.cpp
+++ b/dom/fetch/Fetch.cpp
@@ -136,9 +136,6 @@ public:
   void
   OnResponseAvailable(InternalResponse* aResponse) MOZ_OVERRIDE;
 
-  void
-  OnResponseEnd() MOZ_OVERRIDE;
-
 private:
   ~MainThreadFetchResolver();
 };
@@ -265,14 +262,6 @@ MainThreadFetchResolver::OnResponseAvailable(InternalResponse* aResponse)
   mPromise->MaybeResolve(mResponse);
 }
 
-void
-MainThreadFetchResolver::OnResponseEnd()
-{
-  NS_ASSERT_OWNINGTHREAD(MainThreadFetchResolver);
-  AssertIsOnMainThread();
-  MOZ_ASSERT(mResponse);
-}
-
 MainThreadFetchResolver::~MainThreadFetchResolver()
 {
   NS_ASSERT_OWNINGTHREAD(MainThreadFetchResolver);
diff --git a/dom/fetch/FetchDriver.h b/dom/fetch/FetchDriver.h
index 17303d493138..008b359e7327 100644
--- a/dom/fetch/FetchDriver.h
+++ b/dom/fetch/FetchDriver.h
@@ -31,7 +31,8 @@ class FetchDriverObserver
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FetchDriverObserver);
   virtual void OnResponseAvailable(InternalResponse* aResponse) = 0;
-  virtual void OnResponseEnd() = 0;
+  virtual void OnResponseEnd()
+  { };
 
 protected:
   virtual ~FetchDriverObserver()