[core] Eliminate FileCache interface

There is only one implementation and we're unlikely to add more.

2 files changed, 15 insertions, 7 deletions

diff --git a/src/mbgl/storage/request_base.hpp b/src/mbgl/storage/request_base.hpp
index a0476d49bf..e3d33571d4 100644
--- a/src/mbgl/storage/request_base.hpp
+++ b/src/mbgl/storage/request_base.hpp
@@ -2,7 +2,6 @@
 #define MBGL_STORAGE_REQUEST_BASE
 
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/storage/file_cache.hpp>
 
 #include <memory>
 #include <functional>
diff --git a/src/mbgl/storage/sqlite_cache.hpp b/src/mbgl/storage/sqlite_cache.hpp
index 6e79d44a33..ed94dfbc8c 100644
--- a/src/mbgl/storage/sqlite_cache.hpp
+++ b/src/mbgl/storage/sqlite_cache.hpp
@@ -1,27 +1,36 @@
 #ifndef MBGL_STORAGE_DEFAULT_SQLITE_CACHE
 #define MBGL_STORAGE_DEFAULT_SQLITE_CACHE
 
-#include <mbgl/storage/file_cache.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/chrono.hpp>
 
+#include <functional>
+#include <memory>
 #include <string>
 
 namespace mbgl {
 
+struct Resource;
+class Response;
+class WorkRequest;
+
 namespace util {
 template <typename T> class Thread;
 } // namespace util
 
-class SQLiteCache : public FileCache {
+class SQLiteCache : private util::noncopyable {
 public:
     SQLiteCache(const std::string &path = ":memory:");
-    ~SQLiteCache() override;
+    ~SQLiteCache();
 
     void setMaximumCacheSize(uint64_t size);
     void setMaximumCacheEntrySize(uint64_t size);
 
-    // FileCache API
-    std::unique_ptr<WorkRequest> get(const Resource &resource, Callback callback) override;
-    void put(const Resource &resource, std::shared_ptr<const Response> response, Hint hint) override;
+    enum class Hint : bool { Full, Refresh };
+    using Callback = std::function<void(std::unique_ptr<Response>)>;
+
+    std::unique_ptr<WorkRequest> get(const Resource&, Callback);
+    void put(const Resource&, std::shared_ptr<const Response> response, Hint hint);
 
     class Impl;