diff -r 6f2c1c46032b -r 6c1a2771f4b7 searcher/searchserver/src/csearchserver.cpp --- a/searcher/searchserver/src/csearchserver.cpp Mon May 03 13:33:22 2010 +0300 +++ b/searcher/searchserver/src/csearchserver.cpp Fri May 14 16:57:37 2010 +0300 @@ -24,7 +24,6 @@ #include "SearchServerCommon.h" #include "CSearchServerSession.h" #include "CCPixIdxDb.h" -#include "SearchServerTesting.h" #include "CHouseKeepingHandler.h" #include "SearchServerLogger.h" #include "OstTraceDefinitions.h" @@ -306,21 +305,10 @@ // Install active scheduler CActiveScheduler::Install(activeScheduler); - -#ifdef PROVIDE_TESTING_UTILITY - CSearchServerTesting* testing = new ( ELeave ) CSearchServerTesting; \ - CleanupStack::PushL( testing ); \ - testing->ConstructL(); - testing->StartL(); -#endif // Construct server CSearchServer* server = CSearchServer::NewLC(); -#ifdef PROVIDE_TESTING_UTILITY - testing->SetServer( server ); -#endif - // Rename the thread. User::RenameThread(KSearchServerName); RProcess::Rendezvous(KErrNone); @@ -352,11 +340,6 @@ // Cleanup CleanupStack::PopAndDestroy( server ); - -#ifdef PROVIDE_TESTING_UTILITY - CleanupStack::PopAndDestroy( testing ); -#endif // PROVIDE_TESTING_UTILITY - CleanupStack::PopAndDestroy( activeScheduler ); }