--- a/realtimenetprots/sipfw/SIP/NetworkMonitor/src/CNetworkManager.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/NetworkMonitor/src/CNetworkManager.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -103,14 +103,6 @@
 										 TInt aError )
 	{
 	__SIP_LOG("CNetworkManager::RegisterObserverL, Start")
-	// A bearer monitor plugin is not needed on emulator, except when doing
-	// unit testing
-#if ((defined (__WINS__) || defined(__WINSCW__)) && !defined(CPPUNIT_TEST) )
-
-	aError++; aIapId++; aObserver; // Avoid compiler warnings
-	return;
-
-#else
 
 	// Try to find an existing observer entry from the registry
 	TInt index = FindRegistryEntry( aObserver );
@@ -138,7 +130,6 @@
    		iObservers.AppendL( entry );
     	CleanupStack::Pop( bearer );	
 		}
-#endif
 	}
 
 // -----------------------------------------------------------------------------
@@ -495,19 +486,8 @@
 const TSIPAccessNetworkInfo& CNetworkManager::RegisterAccessNetworkObserver(
     MSIPNetworkInfoObserver& aObserver )
 	{
-	// A bearer monitor plugin is not needed on emulator, except when doing
-	// unit testing
-#if ((defined (__WINS__) || defined(__WINSCW__)) && !defined(CPPUNIT_TEST) )
-	aObserver; // Avoid compiler warnings
-	
-	//Since the real plugin is not started in emulator, pass hardcoded values
-	//to ConnectionMgr so that the P-Access-Network-Info header can be tested.
-	iAccessNetworkInfo = DummyAccessNetworkValues();
-	
-#else
+    
 	iNetworkInfoObserver = &aObserver;
-#endif
-
 	return iAccessNetworkInfo;
 	}