Revert "Use gid to lid change handler interface directly"

1 files changed, 1 insertions, 14 deletions

diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index 1ec201fdbd2..15bd55441d4 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -12,7 +12,6 @@
 #include <vespa/searchcore/proton/server/putdonecontext.h>
 #include <vespa/searchcore/proton/server/removedonecontext.h>
 #include <vespa/searchcore/proton/server/storeonlyfeedview.h>
-#include <vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h>
 #include <vespa/searchcore/proton/test/mock_summary_adapter.h>
 #include <vespa/searchcore/proton/test/thread_utils.h>
 #include <vespa/searchlib/common/idestructorcallback.h>
@@ -68,17 +67,7 @@ DocumentTypeRepo::SP myGetDocumentTypeRepo() {
     return repo;
 }
 
-struct MyMinimalFeedViewBase
-{
-    std::shared_ptr<IGidToLidChangeHandler> gidToLidChangeHandler;
-
-    MyMinimalFeedViewBase()
-        : gidToLidChangeHandler(std::make_shared<DummyGidToLidChangeHandler>())
-    {
-    }
-};
-
-struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedView {
+struct MyMinimalFeedView : public StoreOnlyFeedView {
     using UP = std::unique_ptr<MyMinimalFeedView>;
 
     int removeMultiAttributesCount;
@@ -94,12 +83,10 @@ struct MyMinimalFeedView : public MyMinimalFeedViewBase, public StoreOnlyFeedVie
                       CommitTimeTracker &commitTimeTracker,
                       const PersistentParams &params,
                       int &outstandingMoveOps_) :
-        MyMinimalFeedViewBase(),
         StoreOnlyFeedView(StoreOnlyFeedView::Context(summaryAdapter,
                           search::index::Schema::SP(),
                           DocumentMetaStoreContext::SP(
                                   new DocumentMetaStoreContext(metaStore)),
-                                                     *gidToLidChangeHandler,
                                                      myGetDocumentTypeRepo(),
                                                      writeService,
                                                      lidReuseDelayer,