--- a/installationservices/swi/test/tuiscriptadaptors/tswisstep.h	Thu Aug 19 10:02:49 2010 +0300
+++ b/installationservices/swi/test/tuiscriptadaptors/tswisstep.h	Tue Aug 31 15:21:33 2010 +0300
@@ -32,11 +32,14 @@
 #include <swi/sistruststatus.h>
 
 #include <e32base.h>
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 #ifndef SWI_TEXTSHELL_ROM		
 #include <apsidchecker.h>
 #else
 class CAppSidChecker;
 #endif
+#endif
 
 namespace Swi
 	{
@@ -221,7 +224,7 @@
 class CSwisInstallStep : public CSwisTestStep
 	{
 public:
-	enum TInstallType { EUseFileHandle, EUseMemory, EUseFileName, EUseCAF, EUseOpenFileName, ECheckExitValue};
+	enum TInstallType { EUseFileHandle, EUseMemory, EUseFileName, EUseCAF, EUseOpenFileName, ECheckExitValue, ECheckInstallPerformance};
 
 	CSwisInstallStep(TInstallType aInstallType, TBool aDoCancelTest = EFalse);
 	~CSwisInstallStep();
@@ -231,6 +234,7 @@
 private:
 	TInt DoInstallL(Swi::CInstallPrefs& aInstallPrefs);
 	void GetFilesToHoldOpenL();
+	void PrintPerformanceLog(TTime aTime);
 
 private:
 	TFileName iSisFileName; // name of the file to install
@@ -332,6 +336,7 @@
 #endif
 
 _LIT(KSwisInstallStep, "InstallStep");
+_LIT(KSwisInstallPerformanceStep, "InstallPerformanceStep");
 _LIT(KSwisInstallFHStep, "InstallFHStep"); // install using file handles
 _LIT(KSwisInstallMemStep, "InstallMemStep"); // install from memory
 _LIT(KSwisInstallCAFStep, "InstallCAFStep"); // install from CAF
@@ -487,9 +492,13 @@
 	TInt iDrive;
 	TInt iBootMode;
 	TChar iDriveChar;
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 #ifndef SWI_TEXTSHELL_ROM
 	CAppSidChecker *iSwiSidChecker;
 #endif
+#endif
+
 	};
 	
 /**
@@ -521,5 +530,4 @@
     ~CSwisSetRemoveWithLastDependent();
     virtual TVerdict doTestStepL();
     };
-
 #endif // __TSWISSTEP_H__