diff -r e4ebb16b39ea -r 603d3f8b6302 plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/src/t_cpplpredictivesearchtable.cpp
--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/src/t_cpplpredictivesearchtable.cpp	Fri Sep 17 08:34:34 2010 +0300
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql/src/t_cpplpredictivesearchtable.cpp	Mon Oct 04 01:37:06 2010 +0300
@@ -102,20 +102,9 @@
     // It generates the test case table.
     CEUnitTestSuiteClass::ConstructL();
     
-#if defined(USE_ORBIT_KEYMAP)
     // Create singleton outside actual test cases so that it is not treated as
     // resource leak, since it can't be deleted.
     HbKeymapFactory::instance();
-#else
-    // If Orbit keymap is not used, EUnit shows there is a resource leak in the
-    // first test case of UT_CPplPredictiveSearchTable that writes something to
-    // the database.
-    // To get rid of the resource leak, the following code is here to create DB,
-    // and one contact, delete it, delete DB. 
-    SetupL();
-    UT_DeleteLL(); // Adds and deletes 1 contact
-    Teardown();
-#endif
     }
     
 // -----------------------------------------------------------------------------
@@ -143,9 +132,7 @@
                                             *iTable,
                                             *iPredSearchQwertyTable,
                                             *iPredSearchSettingsTable);  
-#if defined(USE_ORBIT_KEYMAP)
     HbKeymapFactory::instance();
-#endif
 	}
     
 // -----------------------------------------------------------------------------