diff -r d3e8e7d462dd -r f92a4f87e424 usbmgmt/usbmgrtest/t_charging_emu/src/tbatterycharging.cpp
--- a/usbmgmt/usbmgrtest/t_charging_emu/src/tbatterycharging.cpp	Thu Jul 15 20:42:20 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_charging_emu/src/tbatterycharging.cpp	Tue Aug 31 17:01:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,7 +21,6 @@
 #include <e32svr.h>
 #include <e32base.h>
 #include <e32std.h>
-#include <usbman.rsg>
 #include <f32file.h>
 #include <barsc.h>
 #include <barsread.h>
@@ -129,7 +128,6 @@
 	iPlugin = iExtensionPlugins[0];
 
 	iDummyLdd.Initialise();
-	//iRepository = CRepository::NewL(KUsbBatteryChargingCentralRepositoryUid);
 	User::LeaveIfError(iTimer.CreateLocal());
 	
 	DefinePropertyL(KBattChargWriteRepositoryUid, KBattChargWriteRepositoryKey,RProperty::EInt);
@@ -346,7 +344,7 @@
 
 TInt CDummyUsbDevice::GetNextLine()
 	{
-	TInt newLineOffset = (iPtr.Mid(iFileOffset)).Locate(13);//Find(_L("\r\n"));
+	TInt newLineOffset = (iPtr.Mid(iFileOffset)).Locate(13);
 	if (newLineOffset < 0)
 		{
 		return newLineOffset;
@@ -427,7 +425,6 @@
 			{
 			TInt err = WriteToRepositoryProperty(iCommandValue);
 			
-			//TInt err = iRepository->Set(KUsbBatteryChargingKeyEnabledUserSetting, iCommandValue);
 			iTest(err == KErrNone);
 			}
 			break;
@@ -483,8 +480,6 @@
 			TInt current;			
 			TInt err = GetChargingCurrentFromProperty(current);
 			
-			//TInt err = RProperty::Get(KPropertyUidUsbBatteryChargingCategory,
-			//	KPropertyUidUsbBatteryChargingChargingCurrent, current);
 			iTest(err == KErrNone);
 			iTest(current == iCheckValue);
 			}