Remove Environment::terminate and associated code

Fixes #1336

1 files changed, 3 insertions, 11 deletions

diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp
index 30e88c39f6..535c41e819 100644
--- a/include/mbgl/storage/file_source.hpp
+++ b/include/mbgl/storage/file_source.hpp
@@ -15,7 +15,6 @@ typedef struct uv_loop_s uv_loop_t;
 namespace mbgl {
 
 class Request;
-class Environment;
 
 class FileSource : private util::noncopyable {
 protected:
@@ -28,19 +27,12 @@ public:
 
     // These can be called from any thread. The callback will be invoked in the loop.
     // You can only cancel a request from the same thread it was created in.
-    virtual Request *request(const Resource &resource, uv_loop_t *loop, const Environment &env,
-                             Callback callback) = 0;
-    virtual void cancel(Request *request) = 0;
+    virtual Request* request(const Resource&, uv_loop_t*, Callback) = 0;
+    virtual void cancel(Request*) = 0;
 
     // These can be called from any thread. The callback will be invoked in an arbitrary other thread.
     // You cannot cancel these requests.
-    virtual void request(const Resource &resource, const Environment &env, Callback callback) = 0;
-
-    // This can be called from any thread. All requests with the environment pointer env should be
-    // notified as errored. Note that this is /different/ from canceling requests; a canceled
-    // request's callback is never called, while an aborted request's callback is called with
-    // a error message.
-    virtual void abort(const Environment &env) = 0;
+    virtual void request(const Resource&, Callback) = 0;
 };
 
 }