--- a/usbmgmt/usbmgrtest/t_charging_emu/src/CUsbBatteryChargingTestPlugin.cpp	Mon Sep 06 11:27:08 2010 +0800
+++ b/usbmgmt/usbmgrtest/t_charging_emu/src/CUsbBatteryChargingTestPlugin.cpp	Thu Sep 16 12:03:29 2010 +0800
@@ -22,12 +22,6 @@
 
 #include <ecom/implementationproxy.h>
 
-#include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "USBCHARGE TEST");
-#endif
-
 #include <dummyldd.h>
 #define __D32USBC_H__ // ensure that d32usbc is ignored, and dummyldd used instead
 #include "CUsbBatteryChargingTestPlugin.h"
@@ -69,7 +63,6 @@
 	aInfo.iPluginState = iPluginState;
 	aInfo.iAvailableMilliAmps = iAvailableMilliAmps;
 	aInfo.iDeviceState = iDeviceState;
-	aInfo.iUserSetting = iUserSetting;
 	aInfo.iCurrentIndexRequested = iCurrentIndexRequested;
 	aInfo.iRequestedCurrentValue = iRequestedCurrentValue;
 	}
@@ -77,11 +70,15 @@
 TAny* CUsbBatteryChargingTestPlugin::GetInterface(TUid aUid)
 	{
 	TAny* ret = NULL;
+    ret = CUsbBatteryChargingPlugin::GetInterface(aUid);
+    if(!ret)
+        {
 	if (aUid == KUidUsbBatteryChargingTestPluginInterface2)
 		{
 		ret = reinterpret_cast<TAny*>(
 			static_cast<MUsbBatteryChargingTestPluginInterface2*>(this)
 			);
 		}
+        }
 	return ret;
 	}