21 files changed, 328 insertions, 212 deletions
diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp
index a67e691f69..a4ba981a13 100644
--- a/test/api/annotations.test.cpp
+++ b/test/api/annotations.test.cpp
@@ -6,6 +6,7 @@
 #include <mbgl/style/image.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/color.hpp>
@@ -27,12 +28,15 @@ std::unique_ptr<style::Image> namedMarker(const std::string& name) {
 class AnnotationTest {
 public:
     util::RunLoop loop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource };
 
-    Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
-              MapOptions().withMapMode(MapMode::Static)};
+    HeadlessFrontend frontend { pixelRatio, stubFileSourceOptions };
+
+    Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
+              MapOptions().withMapMode(MapMode::Static), stubFileSourceOptions };
 
     void checkRendering(const char * name) {
         test::checkImage(std::string("test/fixtures/annotations/") + name,
diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp
index 9490c14e1f..ab98aa0e81 100644
--- a/test/api/api_misuse.test.cpp
+++ b/test/api/api_misuse.test.cpp
@@ -4,6 +4,7 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/storage/online_file_source.hpp>
@@ -21,13 +22,15 @@ TEST(API, RenderWithoutCallback) {
 
     util::RunLoop loop;
 
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    auto fileSource = platform::Factory::sharedFileSource(stubFileSourceOptions, std::make_shared<StubFileSource>());
+
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource };
+
+    HeadlessFrontend frontend { pixelRatio, stubFileSourceOptions };
 
     auto map = std::make_unique<Map>(frontend, MapObserver::nullObserver(), frontend.getSize(),
-                                     pixelRatio, fileSource,
-                                     MapOptions().withMapMode(MapMode::Static));
+                                     pixelRatio, MapOptions().withMapMode(MapMode::Static), stubFileSourceOptions);
     map->renderStill(nullptr);
 
     // Force Map thread to join.
diff --git a/test/api/custom_geometry_source.test.cpp b/test/api/custom_geometry_source.test.cpp
index 54df2e5cfb..549036e3b0 100644
--- a/test/api/custom_geometry_source.test.cpp
+++ b/test/api/custom_geometry_source.test.cpp
@@ -2,6 +2,7 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/style/style.hpp>
@@ -15,15 +16,17 @@
 
 using namespace mbgl;
 using namespace mbgl::style;
+using namespace mbgl::platform;
 
 TEST(CustomGeometrySource, Grid) {
     util::RunLoop loop;
 
-    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
+    auto fileSourceOptions = FileSourceOptions().withCachePath(":memory:").withAssetRoot("test/fixtures/api/assets");
+
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource };
-    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
-            MapOptions().withMapMode(MapMode::Static));
+    HeadlessFrontend frontend { pixelRatio, fileSourceOptions };
+    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
+            MapOptions().withMapMode(MapMode::Static), fileSourceOptions);
     map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
     map.jumpTo(CameraOptions().withCenter(LatLng { 37.8, -122.5 }).withZoom(10.0));
 
diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp
index 7ea5f57cd8..e55398f0d9 100644
--- a/test/api/custom_layer.test.cpp
+++ b/test/api/custom_layer.test.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/test/util.hpp>
 
 #include <mbgl/platform/gl_functions.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
 #include <mbgl/storage/default_file_source.hpp>
@@ -89,11 +90,12 @@ public:
 TEST(CustomLayer, Basic) {
     util::RunLoop loop;
 
-    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
+    auto fileSourceOptions = FileSourceOptions().withCachePath(":memory:").withAssetRoot("test/fixtures/api/assets");
+
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource };
-    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
-            MapOptions().withMapMode(MapMode::Static));
+    HeadlessFrontend frontend { pixelRatio, fileSourceOptions };
+    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
+            MapOptions().withMapMode(MapMode::Static), fileSourceOptions);
     map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
     map.jumpTo(CameraOptions().withCenter(LatLng { 37.8, -122.5 }).withZoom(10.0));
     map.getStyle().addLayer(std::make_unique<CustomLayer>(
diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp
index b7359e4e60..99b74ab393 100644
--- a/test/api/query.test.cpp
+++ b/test/api/query.test.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/map/map.hpp>
-#include <mbgl/map/map_options.hpp>
 #include <mbgl/test/stub_file_source.hpp>
+#include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/test/util.hpp>
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/io.hpp>
@@ -32,15 +33,17 @@ public:
     }
 
     util::RunLoop loop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(stubFileSourceOptions, std::make_shared<StubFileSource>());
     float pixelRatio { 1 };
-    HeadlessFrontend frontend { pixelRatio, fileSource };
-    Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
-              MapOptions().withMapMode(MapMode::Static)};
+    HeadlessFrontend frontend { pixelRatio, stubFileSourceOptions };
+    Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
+              MapOptions().withMapMode(MapMode::Static), stubFileSourceOptions };
 };
 
 std::vector<Feature> getTopClusterFeature(QueryTest& test) {
-    test.fileSource.sourceResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->sourceResponse = [&] (const Resource& resource) {
         EXPECT_EQ("http://url"s, resource.url);
         Response response;
         response.data = std::make_unique<std::string>(util::read_file("test/fixtures/supercluster/places.json"s));
@@ -52,7 +55,7 @@ std::vector<Feature> getTopClusterFeature(QueryTest& test) {
     options.cluster = true;
     auto source = std::make_unique<GeoJSONSource>("cluster_source"s, options);
     source->setURL("http://url"s);
-    source->loadDescription(test.fileSource);
+    source->loadDescription(stubFileSource);
 
     auto clusterLayer = std::make_unique<SymbolLayer>("cluster_layer"s, "cluster_source"s);
     clusterLayer->setIconImage("test-icon"s);
diff --git a/test/api/recycle_map.cpp b/test/api/recycle_map.cpp
index 5598dfbd85..fe6161d6fa 100644
--- a/test/api/recycle_map.cpp
+++ b/test/api/recycle_map.cpp
@@ -4,6 +4,7 @@
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/storage/online_file_source.hpp>
 #include <mbgl/style/layers/symbol_layer.hpp>
@@ -23,13 +24,13 @@ using namespace mbgl::style;
 TEST(API, RecycleMapUpdateImages) {
     util::RunLoop loop;
 
-    StubFileSource fileSource;
+    auto fileSource = platform::Factory::sharedFileSource({}, std::make_shared<StubFileSource>());
     float pixelRatio { 1 };
 
-    HeadlessFrontend frontend { pixelRatio, fileSource };
-    auto map = std::make_unique<Map>(frontend, MapObserver::nullObserver(), frontend.getSize(),
-                                     pixelRatio, fileSource,
-                                     MapOptions().withMapMode(MapMode::Static));
+    FileSourceOptions stubFileSourceOptions;
+    HeadlessFrontend frontend { pixelRatio, stubFileSourceOptions };
+    auto map = std::make_unique<Map>(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
+                                     MapOptions().withMapMode(MapMode::Static), stubFileSourceOptions );
 
     EXPECT_TRUE(map);
 
diff --git a/test/gl/context.test.cpp b/test/gl/context.test.cpp
index 5703792a7d..a0024f24df 100644
--- a/test/gl/context.test.cpp
+++ b/test/gl/context.test.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/test/util.hpp>
 
 #include <mbgl/platform/gl_functions.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
@@ -85,13 +86,14 @@ struct Buffer {
 TEST(GLContextMode, Shared) {
     util::RunLoop loop;
 
-    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
     float pixelRatio { 1 };
 
-    HeadlessFrontend frontend { pixelRatio, fileSource, {}, GLContextMode::Shared };
+    auto fileSourceOptions = FileSourceOptions().withCachePath(":memory:").withAssetRoot("test/fixtures/api/assets");
+
+    HeadlessFrontend frontend { pixelRatio, fileSourceOptions, {}, GLContextMode::Shared };
 
     Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
-            fileSource, MapOptions().withMapMode(MapMode::Static));
+            MapOptions().withMapMode(MapMode::Static), fileSourceOptions);
     map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
     map.jumpTo(CameraOptions().withCenter(LatLng { 37.8, -122.5 }).withZoom(10.0));
 
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp
index ecbb92d164..6970ab8b72 100644
--- a/test/map/map.test.cpp
+++ b/test/map/map.test.cpp
@@ -6,6 +6,7 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/gl/context.hpp>
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/storage/network_status.hpp>
@@ -26,29 +27,31 @@ using namespace mbgl;
 using namespace mbgl::style;
 using namespace std::literals::string_literals;
 
-template <class FileSource = StubFileSource>
+template <class T = StubFileSource>
 class MapTest {
 public:
     util::RunLoop runLoop;
-    FileSource fileSource;
+    FileSourceOptions fileSourceOptions;
+    std::shared_ptr<FileSource> fileSource;
     StubMapObserver observer;
     HeadlessFrontend frontend;
     Map map;
 
     MapTest(float pixelRatio = 1, MapMode mode = MapMode::Static)
-        : frontend(pixelRatio, fileSource)
+        : fileSource(platform::Factory::sharedFileSource(fileSourceOptions, std::make_shared<T>()))
+        , frontend(pixelRatio, fileSourceOptions)
         , map(frontend, observer, frontend.getSize(), pixelRatio,
-              fileSource, MapOptions().withMapMode(mode)) {
+              MapOptions().withMapMode(mode), fileSourceOptions) {
     }
 
-    template <typename T = FileSource>
+    template <typename U = T>
     MapTest(const std::string& cachePath, const std::string& assetRoot,
             float pixelRatio = 1, MapMode mode = MapMode::Static,
-            typename std::enable_if<std::is_same<T, DefaultFileSource>::value>::type* = 0)
-            : fileSource { cachePath, assetRoot }
-            , frontend(pixelRatio, fileSource)
-            , map(frontend, observer, frontend.getSize(), pixelRatio,
-                  fileSource, MapOptions().withMapMode(mode)) {
+            typename std::enable_if<std::is_same<U, DefaultFileSource>::value>::type* = 0)
+            : fileSourceOptions(FileSourceOptions().withCachePath(cachePath).withAssetRoot(assetRoot))
+            , fileSource(platform::Factory::sharedFileSource(fileSourceOptions))
+            , frontend(pixelRatio, fileSourceOptions)
+            , map(frontend, observer, frontend.getSize(), pixelRatio, MapOptions().withMapMode(mode), fileSourceOptions) {
     }
 };
 
@@ -233,12 +236,13 @@ TEST(Map, Offline) {
     };
 
     const std::string prefix = "http://127.0.0.1:3000/";
-    test.fileSource.put(Resource::style(prefix + "style.json"), expiredItem("style.json"));
-    test.fileSource.put(Resource::source(prefix + "streets.json"), expiredItem("streets.json"));
-    test.fileSource.put(Resource::spriteJSON(prefix + "sprite", 1.0), expiredItem("sprite.json"));
-    test.fileSource.put(Resource::spriteImage(prefix + "sprite", 1.0), expiredItem("sprite.png"));
-    test.fileSource.put(Resource::tile(prefix + "{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ), expiredItem("0-0-0.vector.pbf"));
-    test.fileSource.put(Resource::glyphs(prefix + "{fontstack}/{range}.pbf", {{"Helvetica"}}, {0, 255}), expiredItem("glyph.pbf"));
+    auto fileSource = std::static_pointer_cast<DefaultFileSource>(test.fileSource);
+    fileSource->put(Resource::style(prefix + "style.json"), expiredItem("style.json"));
+    fileSource->put(Resource::source(prefix + "streets.json"), expiredItem("streets.json"));
+    fileSource->put(Resource::spriteJSON(prefix + "sprite", 1.0), expiredItem("sprite.json"));
+    fileSource->put(Resource::spriteImage(prefix + "sprite", 1.0), expiredItem("sprite.png"));
+    fileSource->put(Resource::tile(prefix + "{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ), expiredItem("0-0-0.vector.pbf"));
+    fileSource->put(Resource::glyphs(prefix + "{fontstack}/{range}.pbf", {{"Helvetica"}}, {0, 255}), expiredItem("glyph.pbf"));
     NetworkStatus::Set(NetworkStatus::Status::Offline);
 
     test.map.getStyle().loadURL(prefix + "style.json");
@@ -306,7 +310,8 @@ TEST(Map, SetStyleInvalidJSON) {
 TEST(Map, SetStyleInvalidURL) {
     MapTest<> test;
 
-    test.fileSource.styleResponse = [] (const Resource&) {
+    auto fileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    fileSource->styleResponse = [] (const Resource&) {
         Response response;
         response.error = std::make_unique<Response::Error>(
             Response::Error::Reason::Other,
@@ -336,14 +341,16 @@ TEST(Map, StyleFresh) {
     MapTest<FakeFileSource> test;
 
     test.map.getStyle().loadURL("mapbox://styles/test");
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+
+    auto fileSource = std::static_pointer_cast<FakeFileSource>(test.fileSource);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     Response response;
     response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json"));
     response.expires = Timestamp::max();
 
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
 }
 
 TEST(Map, StyleExpired) {
@@ -354,31 +361,33 @@ TEST(Map, StyleExpired) {
     MapTest<FakeFileSource> test;
 
     test.map.getStyle().loadURL("mapbox://styles/test");
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+
+    auto fileSource = std::static_pointer_cast<FakeFileSource>(test.fileSource);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     Response response;
     response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json"));
     response.expires = util::now() - 1h;
 
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     // Mutate layer. From now on, sending a response to the style won't overwrite it anymore, but
     // we should continue to wait for a fresh response.
     test.map.getStyle().addLayer(std::make_unique<style::BackgroundLayer>("bg"));
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     // Send another expired response, and confirm that we didn't overwrite the style, but continue
     // to wait for a fresh response.
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
     EXPECT_NE(nullptr, test.map.getStyle().getLayer("bg"));
 
     // Send a fresh response, and confirm that we didn't overwrite the style, but continue to wait
     // for a fresh response.
     response.expires = util::now() + 1h;
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
     EXPECT_NE(nullptr, test.map.getStyle().getLayer("bg"));
 }
 
@@ -390,20 +399,22 @@ TEST(Map, StyleExpiredWithAnnotations) {
     MapTest<FakeFileSource> test;
 
     test.map.getStyle().loadURL("mapbox://styles/test");
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+
+    auto fileSource = std::static_pointer_cast<FakeFileSource>(test.fileSource);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     Response response;
     response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json"));
     response.expires = util::now() - 1h;
 
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     test.map.addAnnotation(LineAnnotation { LineString<double> {{ { 0, 0 }, { 10, 10 } }} });
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    EXPECT_EQ(1u, fileSource->requests.size());
 
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
 }
 
 TEST(Map, StyleExpiredWithRender) {
@@ -414,20 +425,22 @@ TEST(Map, StyleExpiredWithRender) {
     MapTest<FakeFileSource> test;
 
     test.map.getStyle().loadURL("mapbox://styles/test");
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+
+    auto fileSource = std::static_pointer_cast<FakeFileSource>(test.fileSource);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     Response response;
     response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json"));
     response.expires = util::now() - 1h;
 
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
 
     test.frontend.render(test.map);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    EXPECT_EQ(1u, fileSource->requests.size());
 
-    test.fileSource.respond(Resource::Style, response);
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    fileSource->respond(Resource::Style, response);
+    EXPECT_EQ(1u, fileSource->requests.size());
 }
 
 TEST(Map, StyleEarlyMutation) {
@@ -440,9 +453,10 @@ TEST(Map, StyleEarlyMutation) {
 
     Response response;
     response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/water.json"));
-    test.fileSource.respond(Resource::Style, response);
+    auto fileSource = std::static_pointer_cast<FakeFileSource>(test.fileSource);
+    fileSource->respond(Resource::Style, response);
 
-    EXPECT_EQ(1u, test.fileSource.requests.size());
+    EXPECT_EQ(1u, fileSource->requests.size());
     EXPECT_NE(nullptr, test.map.getStyle().getLayer("water"));
 }
 
@@ -564,7 +578,8 @@ TEST(Map, DisabledSources) {
     MapTest<> test;
 
     // Always load the same image tile for raster layers.
-    test.fileSource.response = [] (const Resource& res) -> optional<Response> {
+    auto fileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    fileSource->response = [] (const Resource& res) -> optional<Response> {
         if (res.url == "asset://tile.png") {
             Response response;
             response.data = std::make_shared<std::string>(
@@ -640,7 +655,8 @@ TEST(Map, DontLoadUnneededTiles) {
     using Tiles = std::unordered_set<std::string>;
     Tiles tiles;
 
-    test.fileSource.tileResponse = [&](const Resource& rsc) {
+    auto fileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    fileSource->tileResponse = [&](const Resource& rsc) {
         tiles.emplace(rsc.url);
         Response res;
         res.noContent = true;
@@ -669,7 +685,7 @@ TEST(Map, DontLoadUnneededTiles) {
 
 TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) {
     util::RunLoop runLoop;
-    DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
+    auto fileSource = platform::Factory::sharedFileSource(FileSourceOptions().withCachePath(":memory:").withAssetRoot("test/fixtures/api/assets"));
     float pixelRatio { 1 };
 
     using namespace std::chrono_literals;
@@ -682,7 +698,8 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) {
 
     util::Timer timer;
 
-    HeadlessFrontend frontend(pixelRatio, fileSource);
+    FileSourceOptions fileSourceOptions;
+    HeadlessFrontend frontend(pixelRatio, fileSourceOptions);
 
     StubMapObserver observer;
     observer.didFinishRenderingFrameCallback = [&] (MapObserver::RenderMode) {
@@ -694,8 +711,8 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) {
         });
     };
 
-    Map map(frontend, observer, frontend.getSize(), pixelRatio, fileSource,
-            MapOptions().withMapMode(MapMode::Continuous));
+    Map map(frontend, observer, frontend.getSize(), pixelRatio,
+            MapOptions().withMapMode(MapMode::Continuous), fileSourceOptions);
     map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json"));
 
     runLoop.run();
@@ -710,9 +727,10 @@ TEST(Map, NoContentTiles) {
     Response response;
     response.noContent = true;
     response.expires = util::now() + 1h;
-    test.fileSource.put(Resource::tile("http://example.com/{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0,
-                                       Tileset::Scheme::XYZ),
-                        response);
+    auto fileSource = std::static_pointer_cast<DefaultFileSource>(test.fileSource);
+    fileSource->put(Resource::tile("http://example.com/{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0,
+                                   Tileset::Scheme::XYZ),
+                    response);
 
     test.map.getStyle().loadJSON(R"STYLE({
       "version": 8,
@@ -747,7 +765,8 @@ TEST(Map, NoContentTiles) {
 TEST(Map, Issue12432) {
     MapTest<> test { 1, MapMode::Continuous };
 
-    test.fileSource.tileResponse = [&](const Resource&) {
+    auto fileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    fileSource->tileResponse = [&](const Resource&) {
         Response result;
         result.data = std::make_shared<std::string>(util::read_file("test/fixtures/map/issue12432/0-0-0.mvt"));
         return result;
diff --git a/test/map/prefetch.test.cpp b/test/map/prefetch.test.cpp
index ba1bd5258e..ac42495b56 100644
--- a/test/map/prefetch.test.cpp
+++ b/test/map/prefetch.test.cpp
@@ -4,6 +4,7 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/style/style.hpp>
@@ -22,7 +23,9 @@ using namespace std::chrono_literals;
 
 TEST(Map, PrefetchTiles) {
     util::RunLoop runLoop;
-    StubFileSource fileSource;
+
+    FileSourceOptions stubFileSourceOptions;
+    auto fileSource = platform::Factory::sharedFileSource(stubFileSourceOptions, std::make_shared<StubFileSource>());
 
     util::Timer emergencyShutoff;
     emergencyShutoff.start(10s, 0s, [&] {
@@ -35,13 +38,14 @@ TEST(Map, PrefetchTiles) {
         runLoop.stop();
     };
 
-    HeadlessFrontend frontend { { 512, 512 }, 1, fileSource };
-    Map map(frontend, observer, frontend.getSize(), 1, fileSource,
-            MapOptions().withMapMode(MapMode::Continuous));
+    HeadlessFrontend frontend { { 512, 512 }, 1, stubFileSourceOptions };
+    Map map(frontend, observer, frontend.getSize(), 1,
+            MapOptions().withMapMode(MapMode::Continuous), stubFileSourceOptions);
 
     std::vector<int> tiles;
 
-    fileSource.response = [&] (const Resource& res) -> optional<Response> {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(fileSource);
+    stubFileSource->response = [&] (const Resource& res) -> optional<Response> {
         static std::string tile = util::read_file("test/fixtures/map/prefetch/tile.png");
 
         auto zoom = std::stoi(res.url);
diff --git a/test/sprite/sprite_loader.test.cpp b/test/sprite/sprite_loader.test.cpp
index 122e711f51..0e681615c9 100644
--- a/test/sprite/sprite_loader.test.cpp
+++ b/test/sprite/sprite_loader.test.cpp
@@ -2,6 +2,7 @@
 #include <mbgl/test/fixture_log_observer.hpp>
 #include <mbgl/test/stub_file_source.hpp>
 
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/sprite/sprite_loader.hpp>
 #include <mbgl/sprite/sprite_loader_observer.hpp>
 #include <mbgl/sprite/sprite_parser.hpp>
@@ -34,16 +35,17 @@ public:
     SpriteLoaderTest() = default;
 
     util::RunLoop loop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(stubFileSourceOptions, std::make_shared<StubFileSource>());
     StubSpriteLoaderObserver observer;
-    SpriteLoader spriteLoader{ 1 };
+    SpriteLoader spriteLoader{ 1.0, stubFileSourceOptions };
 
     void run() {
         // Squelch logging.
         Log::setObserver(std::make_unique<Log::NullObserver>());
 
         spriteLoader.setObserver(&observer);
-        spriteLoader.load("test/fixtures/resources/sprite", fileSource);
+        spriteLoader.load("test/fixtures/resources/sprite");
 
         loop.run();
     }
@@ -84,8 +86,9 @@ Response corruptSpriteResponse(const Resource&) {
 TEST(SpriteLoader, LoadingSuccess) {
     SpriteLoaderTest test;
 
-    test.fileSource.spriteImageResponse = successfulSpriteImageResponse;
-    test.fileSource.spriteJSONResponse = successfulSpriteJSONResponse;
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->spriteImageResponse = successfulSpriteImageResponse;
+    stubFileSource->spriteJSONResponse = successfulSpriteJSONResponse;
 
     test.observer.spriteError = [&] (std::exception_ptr error) {
         FAIL() << util::toString(error);
@@ -103,8 +106,9 @@ TEST(SpriteLoader, LoadingSuccess) {
 TEST(SpriteLoader, JSONLoadingFail) {
     SpriteLoaderTest test;
 
-    test.fileSource.spriteImageResponse = successfulSpriteImageResponse;
-    test.fileSource.spriteJSONResponse = failedSpriteResponse;
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->spriteImageResponse = successfulSpriteImageResponse;
+    stubFileSource->spriteJSONResponse = failedSpriteResponse;
 
     test.observer.spriteError = [&] (std::exception_ptr error) {
         EXPECT_TRUE(error != nullptr);
@@ -118,8 +122,9 @@ TEST(SpriteLoader, JSONLoadingFail) {
 TEST(SpriteLoader, ImageLoadingFail) {
     SpriteLoaderTest test;
 
-    test.fileSource.spriteImageResponse = failedSpriteResponse;
-    test.fileSource.spriteJSONResponse = successfulSpriteJSONResponse;
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->spriteImageResponse = failedSpriteResponse;
+    stubFileSource->spriteJSONResponse = successfulSpriteJSONResponse;
 
     test.observer.spriteError = [&] (std::exception_ptr error) {
         EXPECT_TRUE(error != nullptr);
@@ -133,8 +138,9 @@ TEST(SpriteLoader, ImageLoadingFail) {
 TEST(SpriteLoader, JSONLoadingCorrupted) {
     SpriteLoaderTest test;
 
-    test.fileSource.spriteImageResponse = successfulSpriteImageResponse;
-    test.fileSource.spriteJSONResponse = corruptSpriteResponse;
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->spriteImageResponse = successfulSpriteImageResponse;
+    stubFileSource->spriteJSONResponse = corruptSpriteResponse;
 
     test.observer.spriteError = [&] (std::exception_ptr error) {
         EXPECT_TRUE(error != nullptr);
@@ -148,8 +154,9 @@ TEST(SpriteLoader, JSONLoadingCorrupted) {
 TEST(SpriteLoader, ImageLoadingCorrupted) {
     SpriteLoaderTest test;
 
-    test.fileSource.spriteImageResponse = corruptSpriteResponse;
-    test.fileSource.spriteJSONResponse = successfulSpriteJSONResponse;
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->spriteImageResponse = corruptSpriteResponse;
+    stubFileSource->spriteJSONResponse = successfulSpriteJSONResponse;
 
     test.observer.spriteError = [&] (std::exception_ptr error) {
         EXPECT_TRUE(error != nullptr);
@@ -163,8 +170,9 @@ TEST(SpriteLoader, ImageLoadingCorrupted) {
 TEST(SpriteLoader, LoadingCancel) {
     SpriteLoaderTest test;
 
-    test.fileSource.spriteImageResponse =
-    test.fileSource.spriteJSONResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->spriteImageResponse =
+    stubFileSource->spriteJSONResponse = [&] (const Resource&) {
         test.end();
         return optional<Response>();
     };
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index 73212189de..127a3b78a1 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -37,6 +37,7 @@
 #include <mbgl/annotation/annotation_source.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
 
 #include <cstdint>
 
@@ -46,21 +47,23 @@ using SourceType = mbgl::style::SourceType;
 class SourceTest {
 public:
     util::RunLoop loop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
     StubStyleObserver styleObserver;
     StubRenderSourceObserver renderSourceObserver;
     Transform transform;
     TransformState transformState;
-    Style style { fileSource, 1 };
+    Style style { 1.0, stubFileSourceOptions };
     AnnotationManager annotationManager { style };
     ImageManager imageManager;
-    GlyphManager glyphManager { fileSource };
+    GlyphManager glyphManager { stubFileSourceOptions };
 
     TileParameters tileParameters {
         1.0,
+        fileSource,
         MapDebugOptions(),
         transformState,
-        fileSource,
         MapMode::Continuous,
         annotationManager,
         imageManager,
@@ -90,7 +93,8 @@ public:
 TEST(Source, LoadingFail) {
     SourceTest test;
 
-    test.fileSource.sourceResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->sourceResponse = [&] (const Resource& resource) {
         EXPECT_EQ("url", resource.url);
         Response response;
         response.error = std::make_unique<Response::Error>(
@@ -107,7 +111,7 @@ TEST(Source, LoadingFail) {
 
     VectorSource source("source", "url");
     source.setObserver(&test.styleObserver);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.run();
 }
@@ -115,7 +119,8 @@ TEST(Source, LoadingFail) {
 TEST(Source, LoadingCorrupt) {
     SourceTest test;
 
-    test.fileSource.sourceResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->sourceResponse = [&] (const Resource& resource) {
         EXPECT_EQ("url", resource.url);
         Response response;
         response.data = std::make_unique<std::string>("CORRUPTED");
@@ -130,7 +135,7 @@ TEST(Source, LoadingCorrupt) {
 
     VectorSource source("source", "url");
     source.setObserver(&test.styleObserver);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.run();
 }
@@ -138,7 +143,8 @@ TEST(Source, LoadingCorrupt) {
 TEST(Source, RasterTileEmpty) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.noContent = true;
         return response;
@@ -151,7 +157,7 @@ TEST(Source, RasterTileEmpty) {
     tileset.tiles = { "tiles" };
 
     RasterSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileChanged = [&] (RenderSource& source_, const OverscaledTileID&) {
         EXPECT_EQ("source", source_.baseImpl->id);
@@ -176,7 +182,8 @@ TEST(Source, RasterTileEmpty) {
 TEST(Source, RasterDEMTileEmpty) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.noContent = true;
         return response;
@@ -189,7 +196,7 @@ TEST(Source, RasterDEMTileEmpty) {
     tileset.tiles = { "tiles" };
 
     RasterDEMSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileChanged = [&] (RenderSource& source_, const OverscaledTileID&) {
         EXPECT_EQ("source", source_.baseImpl->id);
@@ -214,7 +221,8 @@ TEST(Source, RasterDEMTileEmpty) {
 TEST(Source, VectorTileEmpty) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.noContent = true;
         return response;
@@ -229,7 +237,7 @@ TEST(Source, VectorTileEmpty) {
     tileset.tiles = { "tiles" };
 
     VectorSource source("source", tileset);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileChanged = [&] (RenderSource& source_, const OverscaledTileID&) {
         EXPECT_EQ("source", source_.baseImpl->id);
@@ -254,7 +262,8 @@ TEST(Source, VectorTileEmpty) {
 TEST(Source, RasterTileFail) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.error = std::make_unique<Response::Error>(
             Response::Error::Reason::Other,
@@ -269,7 +278,7 @@ TEST(Source, RasterTileFail) {
     tileset.tiles = { "tiles" };
 
     RasterSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileError = [&] (RenderSource& source_, const OverscaledTileID& tileID, std::exception_ptr error) {
         EXPECT_EQ(SourceType::Raster, source_.baseImpl->type);
@@ -292,7 +301,8 @@ TEST(Source, RasterTileFail) {
 TEST(Source, RasterDEMTileFail) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.error = std::make_unique<Response::Error>(
             Response::Error::Reason::Other,
@@ -307,7 +317,7 @@ TEST(Source, RasterDEMTileFail) {
     tileset.tiles = { "tiles" };
 
     RasterDEMSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileError = [&] (RenderSource& source_, const OverscaledTileID& tileID, std::exception_ptr error) {
         EXPECT_EQ(SourceType::RasterDEM, source_.baseImpl->type);
@@ -330,7 +340,8 @@ TEST(Source, RasterDEMTileFail) {
 TEST(Source, VectorTileFail) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.error = std::make_unique<Response::Error>(
             Response::Error::Reason::Other,
@@ -347,7 +358,7 @@ TEST(Source, VectorTileFail) {
     tileset.tiles = { "tiles" };
 
     VectorSource source("source", tileset);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileError = [&] (RenderSource& source_, const OverscaledTileID& tileID, std::exception_ptr error) {
         EXPECT_EQ(SourceType::Vector, source_.baseImpl->type);
@@ -370,7 +381,8 @@ TEST(Source, VectorTileFail) {
 TEST(Source, RasterTileCorrupt) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.data = std::make_unique<std::string>("CORRUPTED");
         return response;
@@ -383,7 +395,7 @@ TEST(Source, RasterTileCorrupt) {
     tileset.tiles = { "tiles" };
 
     RasterSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileError = [&] (RenderSource& source_, const OverscaledTileID& tileID, std::exception_ptr error) {
         EXPECT_EQ(source_.baseImpl->type, SourceType::Raster);
@@ -407,7 +419,8 @@ TEST(Source, RasterTileCorrupt) {
 TEST(Source, RasterDEMTileCorrupt) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.data = std::make_unique<std::string>("CORRUPTED");
         return response;
@@ -420,7 +433,7 @@ TEST(Source, RasterDEMTileCorrupt) {
     tileset.tiles = { "tiles" };
 
     RasterDEMSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileError = [&] (RenderSource& source_, const OverscaledTileID& tileID, std::exception_ptr error) {
         EXPECT_EQ(source_.baseImpl->type, SourceType::RasterDEM);
@@ -444,7 +457,8 @@ TEST(Source, RasterDEMTileCorrupt) {
 TEST(Source, VectorTileCorrupt) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.data = std::make_unique<std::string>("CORRUPTED");
         return response;
@@ -459,7 +473,7 @@ TEST(Source, VectorTileCorrupt) {
     tileset.tiles = { "tiles" };
 
     VectorSource source("source", tileset);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileError = [&] (RenderSource& source_, const OverscaledTileID& tileID, std::exception_ptr error) {
         EXPECT_EQ(source_.baseImpl->type, SourceType::Vector);
@@ -482,7 +496,8 @@ TEST(Source, VectorTileCorrupt) {
 TEST(Source, RasterTileCancel) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         test.end();
         return optional<Response>();
     };
@@ -494,7 +509,7 @@ TEST(Source, RasterTileCancel) {
     tileset.tiles = { "tiles" };
 
     RasterSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileChanged = [&] (RenderSource&, const OverscaledTileID&) {
         FAIL() << "Should never be called";
@@ -518,7 +533,8 @@ TEST(Source, RasterTileCancel) {
 TEST(Source, RasterDEMTileCancel) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         test.end();
         return optional<Response>();
     };
@@ -530,7 +546,7 @@ TEST(Source, RasterDEMTileCancel) {
     tileset.tiles = { "tiles" };
 
     RasterDEMSource source("source", tileset, 512);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileChanged = [&] (RenderSource&, const OverscaledTileID&) {
         FAIL() << "Should never be called";
@@ -554,7 +570,8 @@ TEST(Source, RasterDEMTileCancel) {
 TEST(Source, VectorTileCancel) {
     SourceTest test;
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         test.end();
         return optional<Response>();
     };
@@ -568,7 +585,7 @@ TEST(Source, VectorTileCancel) {
     tileset.tiles = { "tiles" };
 
     VectorSource source("source", tileset);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     test.renderSourceObserver.tileChanged = [&] (RenderSource&, const OverscaledTileID&) {
         FAIL() << "Should never be called";
@@ -598,13 +615,14 @@ TEST(Source, RasterTileAttribution) {
     std::string mapboxOSM = ("<a href='https://www.mapbox.com/about/maps/' target='_blank'>&copy; Mapbox</a> "
                              "<a href='http://www.openstreetmap.org/about/' target='_blank'>©️ OpenStreetMap</a>");
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.noContent = true;
         return response;
     };
 
-    test.fileSource.sourceResponse = [&] (const Resource& resource) {
+    stubFileSource->sourceResponse = [&] (const Resource& resource) {
         EXPECT_EQ("url", resource.url);
         Response response;
         response.data = std::make_unique<std::string>(R"TILEJSON({ "tilejson": "2.1.0", "attribution": ")TILEJSON" +
@@ -621,7 +639,7 @@ TEST(Source, RasterTileAttribution) {
 
     RasterSource source("source", "url", 512);
     source.setObserver(&test.styleObserver);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->update(source.baseImpl,
@@ -641,13 +659,14 @@ TEST(Source, RasterDEMTileAttribution) {
 
     std::string mapbox = ("<a href='https://www.mapbox.com/about/maps/' target='_blank'>&copy; Mapbox</a> ");
 
-    test.fileSource.tileResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->tileResponse = [&] (const Resource&) {
         Response response;
         response.noContent = true;
         return response;
     };
 
-    test.fileSource.sourceResponse = [&] (const Resource& resource) {
+    stubFileSource->sourceResponse = [&] (const Resource& resource) {
         EXPECT_EQ("url", resource.url);
         Response response;
         response.data = std::make_unique<std::string>(R"TILEJSON({ "tilejson": "2.1.0", "attribution": ")TILEJSON" +
@@ -663,7 +682,7 @@ TEST(Source, RasterDEMTileAttribution) {
 
     RasterDEMSource source("source", "url", 512);
     source.setObserver(&test.styleObserver);
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->update(source.baseImpl,
@@ -678,7 +697,8 @@ TEST(Source, RasterDEMTileAttribution) {
 TEST(Source, GeoJSonSourceUrlUpdate) {
     SourceTest test;
 
-    test.fileSource.sourceResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->sourceResponse = [&] (const Resource& resource) {
         EXPECT_EQ("url", resource.url);
         Response response;
         response.data = std::make_unique<std::string>(R"({"geometry": {"type": "Point", "coordinates": [1.1, 1.1]}, "type": "Feature", "properties": {}})");
@@ -694,7 +714,7 @@ TEST(Source, GeoJSonSourceUrlUpdate) {
     source.setObserver(&test.styleObserver);
 
     // Load initial, so the source state will be loaded=true
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
 
     // Schedule an update
     test.loop.invoke([&] () {
@@ -708,7 +728,8 @@ TEST(Source, GeoJSonSourceUrlUpdate) {
 TEST(Source, ImageSourceImageUpdate) {
     SourceTest test;
 
-    test.fileSource.response = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->response = [&] (const Resource& resource) {
         EXPECT_EQ("http://url", resource.url);
         Response response;
         response.data = std::make_unique<std::string>(util::read_file("test/fixtures/image/no_profile.png"));
@@ -725,7 +746,7 @@ TEST(Source, ImageSourceImageUpdate) {
     source.setObserver(&test.styleObserver);
 
     // Load initial, so the source state will be loaded=true
-    source.loadDescription(test.fileSource);
+    source.loadDescription(stubFileSource);
     PremultipliedImage rgba({ 1, 1 });
     rgba.data[0] = 255;
     rgba.data[1] = 254;
diff --git a/test/style/style.test.cpp b/test/style/style.test.cpp
index 72f74d3b01..a82868e242 100644
--- a/test/style/style.test.cpp
+++ b/test/style/style.test.cpp
@@ -2,6 +2,7 @@
 #include <mbgl/test/stub_file_source.hpp>
 #include <mbgl/test/fixture_log_observer.hpp>
 
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/style/style_impl.hpp>
 #include <mbgl/style/source_impl.hpp>
 #include <mbgl/style/sources/vector_source.hpp>
@@ -18,8 +19,10 @@ using namespace mbgl::style;
 TEST(Style, Properties) {
     util::RunLoop loop;
 
-    StubFileSource fileSource;
-    Style::Impl style { fileSource, 1.0 };
+    FileSourceOptions stubFileSourceOptions;
+    auto fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
+    Style::Impl style { 1.0, stubFileSourceOptions };
 
     style.loadJSON(R"STYLE({"name": "Test"})STYLE");
     ASSERT_EQ("Test", style.getName());
@@ -60,8 +63,10 @@ TEST(Style, Properties) {
 TEST(Style, DuplicateSource) {
     util::RunLoop loop;
 
-    StubFileSource fileSource;
-    Style::Impl style { fileSource, 1.0 };
+    FileSourceOptions stubFileSourceOptions;
+    auto fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
+    Style::Impl style { 1.0, stubFileSourceOptions };
 
     style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"));
 
@@ -81,8 +86,10 @@ TEST(Style, RemoveSourceInUse) {
     auto log = new FixtureLogObserver();
     Log::setObserver(std::unique_ptr<Log::Observer>(log));
 
-    StubFileSource fileSource;
-    Style::Impl style { fileSource, 1.0 };
+    FileSourceOptions stubFileSourceOptions;
+    auto fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
+    Style::Impl style { 1.0, stubFileSourceOptions };
 
     style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"));
 
diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp
index 5f9de07dba..64c36ef6f7 100644
--- a/test/style/style_layer.test.cpp
+++ b/test/style/style_layer.test.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/test/util.hpp>
 #include <mbgl/test/stub_layer_observer.hpp>
 #include <mbgl/test/stub_file_source.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/style/style_impl.hpp>
 #include <mbgl/style/layers/background_layer.hpp>
 #include <mbgl/style/layers/background_layer_impl.hpp>
@@ -272,8 +273,10 @@ TEST(Layer, DuplicateLayer) {
     util::RunLoop loop;
 
     // Setup style
-    StubFileSource fileSource;
-    Style::Impl style { fileSource, 1.0 };
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
+    Style::Impl style { 1.0, stubFileSourceOptions };
     style.loadJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"));
 
     // Add initial layer
diff --git a/test/text/glyph_manager.test.cpp b/test/text/glyph_manager.test.cpp
index 3d7a220dc5..bcec1ad0cf 100644
--- a/test/text/glyph_manager.test.cpp
+++ b/test/text/glyph_manager.test.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/test/util.hpp>
 #include <mbgl/test/stub_file_source.hpp>
 
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/text/glyph_manager.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/string.hpp>
@@ -65,10 +66,12 @@ public:
 class GlyphManagerTest {
 public:
     util::RunLoop loop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
     StubGlyphManagerObserver observer;
     StubGlyphRequestor requestor;
-    GlyphManager glyphManager{ fileSource, std::make_unique<StubLocalGlyphRasterizer>() };
+    GlyphManager glyphManager{ stubFileSourceOptions, std::make_unique<StubLocalGlyphRasterizer>() };
 
     void run(const std::string& url, GlyphDependencies dependencies) {
         // Squelch logging.
@@ -89,7 +92,8 @@ public:
 TEST(GlyphManager, LoadingSuccess) {
     GlyphManagerTest test;
 
-    test.fileSource.glyphsResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource& resource) {
         EXPECT_EQ(Resource::Kind::Glyphs, resource.kind);
         Response response;
         response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/glyphs.pbf"));
@@ -128,7 +132,8 @@ TEST(GlyphManager, LoadingSuccess) {
 TEST(GlyphManager, LoadingFail) {
     GlyphManagerTest test;
 
-    test.fileSource.glyphsResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource&) {
         Response response;
         response.error = std::make_unique<Response::Error>(
             Response::Error::Reason::Other,
@@ -161,7 +166,8 @@ TEST(GlyphManager, LoadingFail) {
 TEST(GlyphManager, LoadingCorrupted) {
     GlyphManagerTest test;
 
-    test.fileSource.glyphsResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource&) {
         Response response;
         response.data = std::make_unique<std::string>("CORRUPTED");
         return response;
@@ -192,7 +198,8 @@ TEST(GlyphManager, LoadingCorrupted) {
 TEST(GlyphManager, LoadingCancel) {
     GlyphManagerTest test;
 
-    test.fileSource.glyphsResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource&) {
         test.end();
         return optional<Response>();
     };
@@ -212,7 +219,8 @@ TEST(GlyphManager, LoadLocalCJKGlyph) {
     GlyphManagerTest test;
     int glyphResponses = 0;
 
-    test.fileSource.glyphsResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource&) {
         glyphResponses++;
         return optional<Response>();
     };
@@ -257,7 +265,8 @@ TEST(GlyphManager, LoadLocalCJKGlyph) {
 TEST(GlyphManager, LoadingInvalid) {
     GlyphManagerTest test;
 
-    test.fileSource.glyphsResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource& resource) {
         EXPECT_EQ(Resource::Kind::Glyphs, resource.kind);
         Response response;
         response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/fake_glyphs-0-255.pbf"));
@@ -295,10 +304,12 @@ TEST(GlyphManager, ImmediateFileSource) {
     class GlyphManagerTestSynchronous {
     public:
         util::RunLoop loop;
-        StubFileSource fileSource = { StubFileSource::ResponseType::Synchronous };
+        FileSourceOptions stubFileSourceOptions;
+        std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+            stubFileSourceOptions, std::make_shared<StubFileSource>(StubFileSource::ResponseType::Synchronous));
         StubGlyphManagerObserver observer;
         StubGlyphRequestor requestor;
-        GlyphManager glyphManager { fileSource };
+        GlyphManager glyphManager { stubFileSourceOptions };
 
         void run(const std::string& url, GlyphDependencies dependencies) {
             // Squelch logging.
@@ -318,7 +329,8 @@ TEST(GlyphManager, ImmediateFileSource) {
 
     GlyphManagerTestSynchronous test;
 
-    test.fileSource.glyphsResponse = [&] (const Resource&) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource&) {
         Response response;
         response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/glyphs.pbf"));
         return response;
diff --git a/test/text/local_glyph_rasterizer.test.cpp b/test/text/local_glyph_rasterizer.test.cpp
index 5c03945b8c..0d69ff5697 100644
--- a/test/text/local_glyph_rasterizer.test.cpp
+++ b/test/text/local_glyph_rasterizer.test.cpp
@@ -2,6 +2,7 @@
 #include <mbgl/test/stub_file_source.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/color.hpp>
@@ -32,16 +33,18 @@ namespace {
 class LocalGlyphRasterizerTest {
 public:
     LocalGlyphRasterizerTest(const optional<std::string> fontFamily)
-        : frontend(pixelRatio, fileSource, optional<std::string>(), GLContextMode::Unique, fontFamily)
+        : frontend(pixelRatio, stubFileSourceOptions, optional<std::string>(), GLContextMode::Unique, fontFamily)
     {
     }
 
     util::RunLoop loop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
     float pixelRatio { 1 };
-    HeadlessFrontend frontend;
-    Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, fileSource,
-              MapOptions().withMapMode(MapMode::Static)};
+    HeadlessFrontend frontend { pixelRatio, stubFileSourceOptions };
+    Map map { frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio,
+              MapOptions().withMapMode(MapMode::Static), stubFileSourceOptions };
 
     void checkRendering(const char * name) {
         test::checkImage(std::string("test/fixtures/local_glyphs/") + name,
@@ -57,7 +60,8 @@ public:
 TEST(LocalGlyphRasterizer, PingFang) {
     LocalGlyphRasterizerTest test(std::string("PingFang"));
 
-    test.fileSource.glyphsResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource& resource) {
         EXPECT_EQ(Resource::Kind::Glyphs, resource.kind);
         Response response;
         response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/glyphs.pbf"));
@@ -78,7 +82,8 @@ TEST(LocalGlyphRasterizer, NoLocal) {
     // the output should just contain basic latin characters.
     LocalGlyphRasterizerTest test({});
 
-    test.fileSource.glyphsResponse = [&] (const Resource& resource) {
+    auto stubFileSource = std::static_pointer_cast<StubFileSource>(test.fileSource);
+    stubFileSource->glyphsResponse = [&] (const Resource& resource) {
         EXPECT_EQ(Resource::Kind::Glyphs, resource.kind);
         Response response;
         response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/glyphs.pbf"));
diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp
index 834f02879b..4e31ea4dd4 100644
--- a/test/tile/custom_geometry_tile.test.cpp
+++ b/test/tile/custom_geometry_tile.test.cpp
@@ -13,6 +13,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
 
 #include <memory>
 
@@ -21,19 +22,21 @@ using namespace mbgl::style;
 
 class CustomTileTest {
 public:
-    FakeFileSource fileSource;
+    FileSourceOptions fakeFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        fakeFileSourceOptions, std::make_shared<FakeFileSource>());
     TransformState transformState;
     util::RunLoop loop;
-    style::Style style { fileSource, 1 };
+    style::Style style { 1.0, fakeFileSourceOptions };
     AnnotationManager annotationManager { style };
     ImageManager imageManager;
-    GlyphManager glyphManager { fileSource };
+    GlyphManager glyphManager { fakeFileSourceOptions };
 
     TileParameters tileParameters {
         1.0,
+        fileSource,
         MapDebugOptions(),
         transformState,
-        fileSource,
         MapMode::Continuous,
         annotationManager,
         imageManager,
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index e68103f4a0..3c78edf6ea 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -12,6 +12,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
 
 #include <memory>
 
@@ -20,20 +21,22 @@ using namespace mbgl::style;
 
 class GeoJSONTileTest {
 public:
-    FakeFileSource fileSource;
+    FileSourceOptions fakeFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        fakeFileSourceOptions, std::make_shared<FakeFileSource>());
     TransformState transformState;
     util::RunLoop loop;
-    style::Style style { fileSource, 1 };
+    style::Style style { 1.0, fakeFileSourceOptions };
     AnnotationManager annotationManager { style };
     ImageManager imageManager;
-    GlyphManager glyphManager { fileSource };
+    GlyphManager glyphManager { fakeFileSourceOptions };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
         1.0,
+        fileSource,
         MapDebugOptions(),
         transformState,
-        fileSource,
         MapMode::Continuous,
         annotationManager,
         imageManager,
diff --git a/test/tile/raster_dem_tile.test.cpp b/test/tile/raster_dem_tile.test.cpp
index e2e7d44b9b..1b0460cb9a 100644
--- a/test/tile/raster_dem_tile.test.cpp
+++ b/test/tile/raster_dem_tile.test.cpp
@@ -11,25 +11,28 @@
 #include <mbgl/renderer/buckets/hillshade_bucket.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
 
 using namespace mbgl;
 
 class RasterDEMTileTest {
 public:
-    FakeFileSource fileSource;
+    FileSourceOptions fakeFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        fakeFileSourceOptions, std::make_shared<FakeFileSource>());
     TransformState transformState;
     util::RunLoop loop;
-    style::Style style { fileSource, 1 };
+    style::Style style { 1.0, fakeFileSourceOptions };
     AnnotationManager annotationManager { style };
     ImageManager imageManager;
-    GlyphManager glyphManager { fileSource };
+    GlyphManager glyphManager { fakeFileSourceOptions };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
         1.0,
+        fileSource,
         MapDebugOptions(),
         transformState,
-        fileSource,
         MapMode::Continuous,
         annotationManager,
         imageManager,
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index 2e35a94025..1bce370d95 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -11,25 +11,28 @@
 #include <mbgl/renderer/buckets/raster_bucket.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
 
 using namespace mbgl;
 
 class RasterTileTest {
 public:
-    FakeFileSource fileSource;
+    FileSourceOptions fakeFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        fakeFileSourceOptions, std::make_shared<FakeFileSource>());
     TransformState transformState;
     util::RunLoop loop;
-    style::Style style { fileSource, 1 };
+    style::Style style { 1.0, fakeFileSourceOptions };
     AnnotationManager annotationManager { style };
     ImageManager imageManager;
-    GlyphManager glyphManager { fileSource };
+    GlyphManager glyphManager { fakeFileSourceOptions };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
         1.0,
+        fileSource,
         MapDebugOptions(),
         transformState,
-        fileSource,
         MapMode::Continuous,
         annotationManager,
         imageManager,
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index c610d8c1a7..c32a4c42be 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -15,6 +15,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
 
 #include <memory>
 
@@ -22,20 +23,22 @@ using namespace mbgl;
 
 class VectorTileTest {
 public:
-    FakeFileSource fileSource;
+    FileSourceOptions fakeFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        fakeFileSourceOptions, std::make_shared<FakeFileSource>());
     TransformState transformState;
     util::RunLoop loop;
-    style::Style style { fileSource, 1 };
+    style::Style style { 1.0, fakeFileSourceOptions };
     AnnotationManager annotationManager { style };
     ImageManager imageManager;
-    GlyphManager glyphManager { fileSource };
+    GlyphManager glyphManager { fakeFileSourceOptions };
     Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
 
     TileParameters tileParameters {
         1.0,
+        fileSource,
         MapDebugOptions(),
         transformState,
-        fileSource,
         MapMode::Continuous,
         annotationManager,
         imageManager,
diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp
index b64e05124f..7a309770e6 100644
--- a/test/util/memory.test.cpp
+++ b/test/util/memory.test.cpp
@@ -4,6 +4,7 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_options.hpp>
+#include <mbgl/platform/factory.hpp>
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/run_loop.hpp>
@@ -25,16 +26,19 @@ using namespace std::literals::string_literals;
 class MemoryTest {
 public:
     MemoryTest() {
-        fileSource.styleResponse = [&](const Resource& res) { return response("style_" + getType(res) + ".json");};
-        fileSource.tileResponse = [&](const Resource& res) { return response(getType(res) + ".tile"); };
-        fileSource.sourceResponse = [&](const Resource& res) { return response("source_" + getType(res) + ".json"); };
-        fileSource.glyphsResponse = [&](const Resource&) { return response("glyphs.pbf"); };
-        fileSource.spriteJSONResponse = [&](const Resource&) { return response("sprite.json"); };
-        fileSource.spriteImageResponse = [&](const Resource&) { return response("sprite.png"); };
+        auto stubFileSource = std::static_pointer_cast<StubFileSource>(fileSource);
+        stubFileSource->styleResponse = [&](const Resource& res) { return response("style_" + getType(res) + ".json");};
+        stubFileSource->tileResponse = [&](const Resource& res) { return response(getType(res) + ".tile"); };
+        stubFileSource->sourceResponse = [&](const Resource& res) { return response("source_" + getType(res) + ".json"); };
+        stubFileSource->glyphsResponse = [&](const Resource&) { return response("glyphs.pbf"); };
+        stubFileSource->spriteJSONResponse = [&](const Resource&) { return response("sprite.json"); };
+        stubFileSource->spriteImageResponse = [&](const Resource&) { return response("sprite.png"); };
     }
 
     util::RunLoop runLoop;
-    StubFileSource fileSource;
+    FileSourceOptions stubFileSourceOptions;
+    std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+        stubFileSourceOptions, std::make_shared<StubFileSource>());
 
 private:
     Response response(const std::string& path) {
@@ -69,9 +73,9 @@ TEST(Memory, Vector) {
     MemoryTest test;
     float ratio { 2 };
 
-    HeadlessFrontend frontend { { 256, 256 }, ratio, test.fileSource };
-    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), ratio, test.fileSource,
-            MapOptions().withMapMode(MapMode::Static));
+    HeadlessFrontend frontend { { 256, 256 }, ratio, test.stubFileSourceOptions };
+    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), ratio,
+            MapOptions().withMapMode(MapMode::Static), test.stubFileSourceOptions);
     map.jumpTo(CameraOptions().withZoom(16));
     map.getStyle().loadURL("mapbox://streets");
 
@@ -82,9 +86,9 @@ TEST(Memory, Raster) {
     MemoryTest test;
     float ratio { 2 };
 
-    HeadlessFrontend frontend { { 256, 256 }, ratio, test.fileSource };
-    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), ratio, test.fileSource,
-            MapOptions().withMapMode(MapMode::Static));
+    HeadlessFrontend frontend { { 256, 256 }, ratio, test.stubFileSourceOptions };
+    Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), ratio,
+            MapOptions().withMapMode(MapMode::Static), test.stubFileSourceOptions);
     map.getStyle().loadURL("mapbox://satellite");
 
     frontend.render(map);
@@ -119,10 +123,10 @@ TEST(Memory, Footprint) {
 
     class FrontendAndMap {
     public:
-        FrontendAndMap(MemoryTest& test_, const char* style)
-            : frontend(Size{ 256, 256 }, 2, test_.fileSource)
-            , map(frontend, MapObserver::nullObserver(), frontend.getSize(), 2, test_.fileSource,
-                  MapOptions().withMapMode(MapMode::Static)) {
+        FrontendAndMap(const FileSourceOptions& fileSourceOptions, const char* style)
+            : frontend(Size{ 256, 256 }, 2, fileSourceOptions)
+            , map(frontend, MapObserver::nullObserver(), frontend.getSize(), 2,
+                  MapOptions().withMapMode(MapMode::Static), fileSourceOptions) {
             map.jumpTo(CameraOptions().withZoom(16));
             map.getStyle().loadURL(style);
             frontend.render(map);
@@ -134,8 +138,8 @@ TEST(Memory, Footprint) {
 
     // Warm up buffers and cache.
     for (unsigned i = 0; i < 10; ++i) {
-        FrontendAndMap(test, "mapbox://streets");
-        FrontendAndMap(test, "mapbox://satellite");
+        FrontendAndMap(test.stubFileSourceOptions, "mapbox://streets");
+        FrontendAndMap(test.stubFileSourceOptions, "mapbox://satellite");
     }
 
     // Process close callbacks, mostly needed by
@@ -147,14 +151,14 @@ TEST(Memory, Footprint) {
 
     long vectorInitialRSS = mbgl::test::getCurrentRSS();
     for (unsigned i = 0; i < runs; ++i) {
-        maps.emplace_back(std::make_unique<FrontendAndMap>(test, "mapbox://streets"));
+        maps.emplace_back(std::make_unique<FrontendAndMap>(test.stubFileSourceOptions, "mapbox://streets"));
     }
 
     double vectorFootprint = (mbgl::test::getCurrentRSS() - vectorInitialRSS) / double(runs);
 
     long rasterInitialRSS = mbgl::test::getCurrentRSS();
     for (unsigned i = 0; i < runs; ++i) {
-        maps.emplace_back(std::make_unique<FrontendAndMap>(test, "mapbox://satellite"));
+        maps.emplace_back(std::make_unique<FrontendAndMap>(test.stubFileSourceOptions, "mapbox://satellite"));
     }
 
     double rasterFootprint = (mbgl::test::getCurrentRSS() - rasterInitialRSS) / double(runs);