diff -r 4bfa887905cf -r d2b028fd1f7d videoplayback/videoplaybackview/tsrc/testuserinputhandler/inc/testuserinputhandler.h
--- a/videoplayback/videoplaybackview/tsrc/testuserinputhandler/inc/testuserinputhandler.h	Mon Aug 23 14:27:29 2010 +0300
+++ b/videoplayback/videoplaybackview/tsrc/testuserinputhandler/inc/testuserinputhandler.h	Fri Sep 03 12:37:43 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 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"
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:   tester for methods in User Input Handler
-* 
+*
 */
 
 #ifndef __TESTUSERINPUTHANDLER_H__
@@ -23,55 +23,38 @@
 #include <QtTest/QtTest>
 
 
-
 // forward declaration
 class CMPXVideoViewWrapper;
+class VideoBasePlaybackView;
 class CVideoPlaybackUserInputHandler;
-class VideoBasePlaybackView;
 
 
 class TestUserInputHandler : public QObject
 {
     Q_OBJECT
 
-public:
-
-    void init(); 
-    
-    void cleanup();
-        
-    void setup();
-    
-
-    // test functions for the test framework         
-private slots:
-
-    void testProcessMediaKeyPlay();
-
-    void testProcessMediaKeyPause();
-
-    void testProcessMediaKeyPlayPause();
+    public:
+        void init();
+        void cleanup();
+        void setup();
 
-    void testProcessMediaKeyStop();
+    // test functions for the test framework
+    private slots:
+        void testProcessMediaKeyPlay();
+        void testProcessMediaKeyPause();
+        void testProcessMediaKeyPlayPause();
+        void testProcessMediaKeyStop();
+        void testProcessMediaKeyForward();
+        void testProcessMediaKeyRewind();
+        void testProcessMediaKeyVolumeUp();
+        void testProcessMediaKeyVolumeDown();
+        void testProcessMediaKeyWhenLocked();
+        void testProcessMediaKeyWhenInBackground();
 
-    void testProcessMediaKeyForward();
-    
-    void testProcessMediaKeyRewind();
-    
-    void testProcessMediaKeyVolumeUp();
-    
-    void testProcessMediaKeyVolumeDown();
- 
-    void testHandleTVOutEventL();
-		
-    
-signals:
-    
-private:
-    CVideoPlaybackUserInputHandler*     mUserInputHdlr;	
-    VideoBasePlaybackView*              mBaseVideoView;
-    CMPXVideoViewWrapper*               mVideoViewWrapper;
- 
+    private:
+        CVideoPlaybackUserInputHandler*     mUserInputHdlr;
+        VideoBasePlaybackView*              mBaseVideoView;
+        CMPXVideoViewWrapper*               mVideoViewWrapper;
 };