[core] Simplify asset:// implementation

* Move asset:// URL handling to DefaultFileSource.
* AssetFileSource implements FileSource interface and follows familiar implementation patterns.
* Move default implementation to platform/default, zip implementation to platform/android.
* Don't bother with modified / expires / etag -- assets are not cached so it doesn't matter.
* Don't bother with interleaving individual IO calls on the implementation thread. That adds a lot of complexity for very little benefit.

3 files changed, 2 insertions, 13 deletions

diff --git a/test/fixtures/api/annotation.json b/test/fixtures/api/annotation.json
index e0792a40bf..ab83d43476 100644
--- a/test/fixtures/api/annotation.json
+++ b/test/fixtures/api/annotation.json
@@ -3,7 +3,7 @@
   "sources": {
     "fake": {
       "type": "vector",
-      "url": "asset://TEST_DATA/fixtures/tiles/streets.json"
+      "url": "fake"
     }
   },
   "layers": [{
@@ -17,6 +17,5 @@
     "paint": {
       "fill-color": "rgba(255,0,0,1)"
     }
-  }],
-  "sprite": "asset://TEST_DATA/fixtures/resources/sprite"
+  }]
 }
diff --git a/test/fixtures/util.cpp b/test/fixtures/util.cpp
index 9e929a90b4..926e267631 100644
--- a/test/fixtures/util.cpp
+++ b/test/fixtures/util.cpp
@@ -20,14 +20,6 @@
 namespace mbgl {
 namespace test {
 
-std::string getFileSourceRoot() {
-#ifdef MBGL_ASSET_ZIP
-    return "test/fixtures/annotations/assets.zip";
-#else
-    return "";
-#endif
-}
-
 Server::Server(const char* executable) {
     int input[2];
     int output[2];
diff --git a/test/fixtures/util.hpp b/test/fixtures/util.hpp
index e2cadc50dd..d7c9c63a89 100644
--- a/test/fixtures/util.hpp
+++ b/test/fixtures/util.hpp
@@ -22,8 +22,6 @@ class Map;
 
 namespace test {
 
-std::string getFileSourceRoot();
-
 class Server {
 public:
     Server(const char* executable);