diff -r b68fcd923911 -r b8d67d6176f5 phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h
--- a/phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h	Tue May 25 12:41:50 2010 +0300
+++ b/phoneengine/PhoneCntFinder/ContactService/inc/cphcntcontactmatchstrategy.h	Wed Jun 09 09:41:11 2010 +0300
@@ -55,12 +55,14 @@
      * @param aContactManager Contact manager.
      * @param aUriArray Array of contact store URI's used.
      * @param aObserver Observer for finding contacts.
+     * @param aMatchFlags A bitset of flags for matching strategy. Has zero or
+     * more CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags flags set.
      */
     static CPhCntContactMatchStrategy* NewL(
         CVPbkContactManager& aContactManager,
         CPhCntContactStoreUris& aContactStoreUris,
         MVPbkContactFindObserver& aObserver,
-        CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags aMatchFlag );
+        TUint32 aMatchFlags );
 
     /**
      * Destructor.
@@ -135,13 +137,10 @@
         CVPbkContactManager& aContactManager,
         CPhCntContactStoreUris& aContactStoreUris,
         MVPbkContactFindObserver& aObserver,
-        CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags aMatchFlag );
+        TUint32 aMatchFlags );
 
     void ConstructL();
 
-protected: // data
-    CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags iMatchFlag;
-	
 private: // data
 
     /**
@@ -200,6 +199,18 @@
      */
     CCntRawPhoneNumberExtractor* iNumberExtractor;
 
+protected:  // data
+
+    /**
+     * A bitset of matching strategy flags. Changed from
+     * CVPbkPhoneNumberMatchStrategy::TVPbkPhoneNumberMatchFlags enum to TUint32
+     * in order to support multiple flags, as in
+     * CVPbkPhoneNumberMatchStrategy::TConfig.
+	 * 
+	 * Protected because a unit test class derives from this class.
+     */
+    TUint32 iMatchFlags;
+
     };