Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend"

This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.

Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc
diff --git a/src/backends/backendsCommon/test/BackendRegistryTests.cpp b/src/backends/backendsCommon/test/BackendRegistryTests.cpp
index 4afe273..0bc655b 100644
--- a/src/backends/backendsCommon/test/BackendRegistryTests.cpp
+++ b/src/backends/backendsCommon/test/BackendRegistryTests.cpp
@@ -54,7 +54,7 @@
     StaticRegistryInitializer<BackendRegistry> factoryHelper(
         BackendRegistryInstance(),
         "HelloWorld",
-        [&called](const EmptyInitializer&)
+        [&called]()
         {
             called = true;
             return armnn::IBackendInternalUniquePtr(nullptr);
@@ -69,7 +69,7 @@
     // sanity check: the factory still not called
     BOOST_TEST(called == false);
 
-    factoryFunction(EmptyInitializer());
+    factoryFunction();
     BOOST_TEST(called == true);
 }
 
@@ -81,7 +81,7 @@
     bool called = false;
     BackendRegistryInstance().Register(
         "HelloWorld",
-        [&called](const EmptyInitializer&)
+        [&called]()
         {
             called = true;
             return armnn::IBackendInternalUniquePtr(nullptr);
@@ -96,7 +96,7 @@
     // sanity check: the factory still not called
     BOOST_TEST(called == false);
 
-    factoryFunction(EmptyInitializer());
+    factoryFunction();
     BOOST_TEST(called == true);
 }