--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -15,6 +15,8 @@
 *
 */
 
+
+
 // INCLUDE FILES
 #include "HttpClientApp.h"
 #include "HttpClientAppInstance.h"
@@ -26,16 +28,12 @@
 
 #include <in_sock.h>
 #include <CommDbConnPref.h>
-#include <httpfilterauthenticationinterface.h>
+#include <HttpFilterAuthenticationInterface.h>
 #include <uaproffilter_interface.h>
-#include <httpfiltercommonstringsext.h>
+#include <HttpFilterCommonStringsExt.h>
 #include <cdblen.h>
-//#include <deflatefilterinterface.h>
-#include <cookiefilterinterface.h>
-#include <platform/mw/browser_platform_variant.hrh>
-#ifdef BRDO_OCC_ENABLED_FF
-#include <extendedconnpref.h>
-#endif
+//#include <DeflateFilterInterface.h>
+#include <CookieFilterInterface.h>
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
@@ -290,9 +288,6 @@
     iHttpSession.OpenL();
     CLOG_WRITE8( "Session open" );
     InitSessionL();
-
-	//Set it to zero
-	iIapId = 0;
     }
 
 // -----------------------------------------------------------------------------
@@ -385,29 +380,7 @@
                 iPref.SetDialogPreference( ECommDbDialogPrefPrompt );
                 }
 
-        #ifdef BRDO_OCC_ENABLED_FF
-           TExtendedConnPref extPref;
-           CLOG_WRITE( "Setting OCC parameters");
-           CLOG_WRITE_1( "Iap: %d", iIapId );
-           if (iIapId)
-           {
-              CLOG_WRITE( "Iap is found");
-              extPref.SetSnapPurpose(CMManager::ESnapPurposeUnknown);
-              extPref.SetIapId(iIapId);
-           }
-           else
-           {
-              CLOG_WRITE( "Using Internet Snap");
-              extPref.SetSnapPurpose(CMManager::ESnapPurposeInternet);
-           }
-
-           extPref.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent);
-           TConnPrefList prefList;
-           prefList.AppendL(&extPref);
-           iConnection.Start( prefList, iStatus );
-        #else
             iConnection.Start( iPref, iStatus );
-        #endif //BRDO_OCC_ENABLED_FF
 
             // RConnection will complete us.
             doComplete = EFalse;