Change api so that we can drop clone from the interface and prepare for using a true repo.

2 files changed, 9 insertions, 10 deletions

diff --git a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
index d9582cec585..c73ae7e506c 100644
--- a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
@@ -15,9 +15,7 @@ namespace storage {
 struct MergeBlockingTest : public FileStorTestFixture {
     void setupDisks() {
         FileStorTestFixture::setupPersistenceThreads(1);
-        _node->setPersistenceProvider(
-                spi::PersistenceProvider::UP(
-                        new spi::dummy::DummyPersistence(_node->getTypeRepo(), 1)));
+        _node->setPersistenceProvider(std::make_unique<spi::dummy::DummyPersistence>(_node->getTypeRepo(), 1));
     }
 
     void SetUp() override;
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
index 93c484368de..7810a595012 100644
--- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
@@ -77,18 +77,19 @@ spi::LoadType defaultLoadType(0, "default");
 }
 
 struct OperationAbortingTest : FileStorTestFixture {
-    spi::PersistenceProvider::UP _dummyProvider;
-    BlockingMockProvider* _blockingProvider;
+    std::unique_ptr<spi::dummy::DummyPersistence> _dummyProvider;
+    BlockingMockProvider * _blockingProvider;
     std::unique_ptr<vespalib::Barrier> _queueBarrier;
     std::unique_ptr<vespalib::Barrier> _completionBarrier;
 
     void setupProviderAndBarriers(uint32_t queueBarrierThreads) {
         FileStorTestFixture::setupPersistenceThreads(1);
-        _dummyProvider.reset(new spi::dummy::DummyPersistence(_node->getTypeRepo(), 1));
-        _queueBarrier.reset(new vespalib::Barrier(queueBarrierThreads));
-        _completionBarrier.reset(new vespalib::Barrier(2));
-        _blockingProvider = new BlockingMockProvider(*_dummyProvider, *_queueBarrier, *_completionBarrier);
-        _node->setPersistenceProvider(spi::PersistenceProvider::UP(_blockingProvider));
+        _dummyProvider = std::make_unique<spi::dummy::DummyPersistence>(_node->getTypeRepo(), 1);
+        _queueBarrier = std::make_unique<vespalib::Barrier>(queueBarrierThreads);
+        _completionBarrier = std::make_unique<vespalib::Barrier>(2);
+        auto blockingProvider = std::make_unique<BlockingMockProvider>(*_dummyProvider, *_queueBarrier, *_completionBarrier);
+        _blockingProvider = blockingProvider.get();
+        _node->setPersistenceProvider(std::move(blockingProvider));
     }
 
     void validateReplies(DummyStorageLink& link, size_t repliesTotal,