diff -r 50c53e893c3f -r 1221b68b8a5f omadrm/drmplugins/drmrecognizer/src/RecDRM.cpp
--- a/omadrm/drmplugins/drmrecognizer/src/RecDRM.cpp	Thu Aug 19 10:12:10 2010 +0300
+++ b/omadrm/drmplugins/drmrecognizer/src/RecDRM.cpp	Tue Aug 31 15:29:38 2010 +0300
@@ -21,7 +21,6 @@
 #include <apmstd.h>
 #include <ecom/ecom.h>
 #include <ecom/implementationproxy.h>
-#include <featmgr.h>
 
 #include "RecDRM.h"
 
@@ -40,8 +39,6 @@
 const TInt KMaxBufferLength=256;
 
 const TInt KDCFHeaderLength=3;
-
-#ifdef DRM_OMA2_ENABLED
 const TInt KLengthBoxSize = 4;
 const TInt KLengthBoxType = 4;
 const TInt KLengthBoxSize64 = 8;
@@ -53,7 +50,6 @@
 _LIT8(KRoapTriggerElement, "roap-trigger:roapTrigger"); // before OMA spec CR, ROAP Trigger namespace prefix was roap-trigger
 _LIT8(KRoapTriggerElement2, "roap:roapTrigger");
 _LIT8(KRoapTriggerType, "application/vnd.oma.drm.roap-trigger+xml");
-#endif
 
 const TImplementationProxy ImplementationTable[] =
         {
@@ -93,14 +89,12 @@
 
 CApaDRMRecognizer::~CApaDRMRecognizer()
 {
-    FeatureManager::UnInitializeLib();
 }
 
 
 CApaDataRecognizerType* CApaDRMRecognizer::CreateRecognizerL()
 {
-    FeatureManager::InitializeLibL();
-	return new (ELeave) CApaDRMRecognizer ();
+    return new (ELeave) CApaDRMRecognizer ();
 }
 
 
@@ -137,25 +131,22 @@
 #endif
 
 #ifdef DRM_OMA2_ENABLED
-	if( FeatureManager::FeatureSupported( KFeatureIdFfOmadrm2Support ) )
-	    {    
-        // Recognize ROAP Trigger
-        if ( RecognizeRoapTrigger( aBuffer ) )
-            {
-            return;
-            }
-	
-        // Recognize DCFv2    
-        if ( RecognizeODF( aBuffer ) )
-            {
-            return;
-            }
-	    }
-#endif	
-	// Recognize DCFv1
-	TUint8 version = aBuffer[0];
-	TUint8 contentTypeLen = aBuffer[1];
-	TUint8 contentURILen = aBuffer[2];
+    // Recognize ROAP Trigger
+    if ( RecognizeRoapTrigger( aBuffer ) )
+        {
+        return;
+        }
+
+    // Recognize DCFv2
+    if ( RecognizeODF( aBuffer ) )
+        {
+        return;
+        }
+#endif
+    // Recognize DCFv1
+    TUint8 version = aBuffer[0];
+    TUint8 contentTypeLen = aBuffer[1];
+    TUint8 contentURILen = aBuffer[2];
 
     if ( contentTypeLen < KMinContentTypeLen || contentURILen == 0 )
     {
@@ -186,12 +177,6 @@
 #ifdef DRM_OMA2_ENABLED
 TBool CApaDRMRecognizer::RecognizeRoapTrigger( const TDesC8& aBuffer )
 {
-        if( ! ( FeatureManager::FeatureSupported( 
-                KFeatureIdFfOmadrm2Support ) ) )
-            {
-            return EFalse;
-            }
-        
         if ( aBuffer.FindF( KRoapTriggerElement() ) != KErrNotFound
              || aBuffer.FindF( KRoapTriggerElement2() ) != KErrNotFound )
         {
@@ -204,61 +189,54 @@
 
 TBool CApaDRMRecognizer::RecognizeODF( const TDesC8& aBuffer )
 {
-    
-    if( ! ( FeatureManager::FeatureSupported(
-            KFeatureIdFfOmadrm2Support ) ) )
+    if ( aBuffer.Size() < 24 ) return EFalse;
+    TPtrC8 ftypPrefix = aBuffer.Mid( 4, KFTypPrefix().Length() );
+    if ( KFTypPrefix().CompareF( ftypPrefix ) == KErrNone )
+    {
+        TPtrC8 odfPrefix = aBuffer.Mid( 8, KODFPrefix().Length() );
+        if ( KODFPrefix().CompareF( odfPrefix ) == KErrNone )
         {
-        return EFalse;
+            TBuf8<4> buffer;
+            TUint32 size;
+            TPtr8 ptr(NULL, 0);
+            TUint32 offset(20);
+
+            // ODRM box header
+            buffer.Zero();
+            buffer.Copy( aBuffer.Mid( offset, 4 ));
+            size = ReadUint32FromBlock( buffer, 0 );
+            offset += KLengthBoxSize + KLengthBoxType + KLengthVersion + KLengthFlags;
+
+            if (size == 1)
+            {
+                offset += KLengthBoxSize64;
+            }
+            if ( aBuffer.Size() < offset+4 ) return EFalse;
+
+            // Discrete headers box header
+            buffer.Zero();
+            buffer.Copy( aBuffer.Mid( offset, 4 ));
+            size = ReadUint32FromBlock( buffer, 0 );
+            offset += KLengthBoxSize + KLengthBoxType + KLengthVersion + KLengthFlags;
+            if ( size == 1 )
+            {
+                offset += KLengthBoxSize64;
+            }
+            if ( aBuffer.Size() < offset+1 ) return EFalse;
+
+            // Content type
+            buffer.Zero();
+            buffer.Copy( aBuffer.Mid( offset, 1 ));
+            if ( aBuffer.Size() < offset + 1 + buffer[0] ) return EFalse;
+            TPtrC8 mimeType = aBuffer.Mid( offset+1, buffer[0] );
+
+            iConfidence = ECertain;
+            iDataType=TDataType( mimeType );
+            return ETrue;
         }
-    
-	if ( aBuffer.Size() < 24 ) return EFalse;
-	TPtrC8 ftypPrefix = aBuffer.Mid( 4, KFTypPrefix().Length() );
-	if ( KFTypPrefix().CompareF( ftypPrefix ) == KErrNone )
-	{
-		TPtrC8 odfPrefix = aBuffer.Mid( 8, KODFPrefix().Length() );
-		if ( KODFPrefix().CompareF( odfPrefix ) == KErrNone )
-		{
-			TBuf8<4> buffer;
-    		TUint32 size;
-    		TPtr8 ptr(NULL, 0);
-    		TUint32 offset(20);
-    
-    		// ODRM box header
-    		buffer.Zero();
-    		buffer.Copy( aBuffer.Mid( offset, 4 ));
-    		size = ReadUint32FromBlock( buffer, 0 );
-    		offset += KLengthBoxSize + KLengthBoxType + KLengthVersion + KLengthFlags;
-    		
-    		if (size == 1)
-        	{
-        		offset += KLengthBoxSize64;
-        	}
-    		if ( aBuffer.Size() < offset+4 ) return EFalse;
-    		
-    		// Discrete headers box header
-    		buffer.Zero();
-    		buffer.Copy( aBuffer.Mid( offset, 4 ));
-    		size = ReadUint32FromBlock( buffer, 0 );
-    		offset += KLengthBoxSize + KLengthBoxType + KLengthVersion + KLengthFlags;
-    		if ( size == 1 )
-        	{
-        		offset += KLengthBoxSize64;
-        	}
-    		if ( aBuffer.Size() < offset+1 ) return EFalse;
-    		
-    		// Content type
-    		buffer.Zero();
-    		buffer.Copy( aBuffer.Mid( offset, 1 ));
-    		if ( aBuffer.Size() < offset + 1 + buffer[0] ) return EFalse;
-    		TPtrC8 mimeType = aBuffer.Mid( offset+1, buffer[0] );
-   			
-   			iConfidence = ECertain;
-			iDataType=TDataType( mimeType );
-			return ETrue;
-		}
-		
-	}
-	return EFalse;
+
+    }
+    return EFalse;
 }
 #endif