1 files changed, 29 insertions, 29 deletions

diff --git a/test/style/source.cpp b/test/style/source.cpp
index b9eb1bc434..ae8fb54d2f 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/test/stub_file_source.hpp>
 #include <mbgl/test/stub_style_observer.hpp>
 
-#include <mbgl/source/source.hpp>
+#include <mbgl/style/source.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/io.hpp>
@@ -12,8 +12,8 @@
 #include <mbgl/util/worker.hpp>
 #include <mbgl/gl/texture_pool.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/style/style_update_parameters.hpp>
-#include <mbgl/layer/line_layer.hpp>
+#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/style/layers/line_layer.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 
 #include <mapbox/geojsonvt.hpp>
@@ -30,9 +30,9 @@ public:
     Worker worker { 1 };
     gl::TexturePool texturePool;
     AnnotationManager annotationManager { 1.0 };
-    Style style { fileSource, 1.0 };
+    style::Style style { fileSource, 1.0 };
 
-    StyleUpdateParameters updateParameters {
+    style::UpdateParameters updateParameters {
         1.0,
         MapDebugOptions(),
         TimePoint(),
@@ -131,10 +131,10 @@ TEST(Source, RasterTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -160,10 +160,10 @@ TEST(Source, VectorTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -189,10 +189,10 @@ TEST(Source, RasterTileFail) {
         test.end();
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -218,10 +218,10 @@ TEST(Source, VectorTileFail) {
         test.end();
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -246,10 +246,10 @@ TEST(Source, RasterTileCorrupt) {
         test.end();
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -278,10 +278,10 @@ TEST(Source, VectorTileCorrupt) {
     layer->setSource("source", "water");
     test.style.addLayer(std::move(layer));
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -305,10 +305,10 @@ TEST(Source, RasterTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -332,10 +332,10 @@ TEST(Source, VectorTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);