diff -r b23410e29e22 -r 8873e6835f7b contentmgmt/cafstreamingsupport/test/tscaf/source/tkeystreamsink.cpp --- a/contentmgmt/cafstreamingsupport/test/tscaf/source/tkeystreamsink.cpp Fri May 14 17:39:00 2010 +0300 +++ b/contentmgmt/cafstreamingsupport/test/tscaf/source/tkeystreamsink.cpp Thu May 27 14:32:46 2010 +0300 @@ -67,7 +67,6 @@ encryptedStr.Append(*ro->Key()); CleanupStack::PopAndDestroy(ro); -#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY //Create an SDP document object and set the created key stream field object CSdpDocument* sdpDoc = CreateSdpDocumentLC(); //Create an SDP key stream field object with an attribute requiring the service protected RO @@ -113,9 +112,6 @@ } CleanupStack::PopAndDestroy(4, sdpDoc); // fOutputKey, decoder, sink, sdpDoc -#endif - - return TestStepResult(); } @@ -175,7 +171,6 @@ CopyFile2AgentsPrivateFolderL(iParent.Fs(), KProgramProtectedRo(), privatePathA); CopyFile2AgentsPrivateFolderL(iParent.Fs(), KProgramProtectedRo(), privatePathB); -#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY //Create an SDP document object and set the created key stream field object for each decoder CSdpDocument* sdpDoc = CreateSdpDocumentLC(); @@ -284,6 +279,5 @@ CleanupStack::PopAndDestroy(2, sinkB); //< decoderB, sink B CleanupStack::PopAndDestroy(2, sinkA); //< decoderA, sinkA CleanupStack::PopAndDestroy(sdpDoc); //< sdpDoc -#endif return TestStepResult(); }