Autotest for ScreenLocker

client/site_tests/desktopui_ScreenLocker/control

Index: client/site_tests/desktopui_ScreenLocker/control
diff --git a/client/site_tests/desktopui_ScreenSaverUnlock/control b/client/site_tests/desktopui_ScreenLocker/control
similarity index 50%
rename from client/site_tests/desktopui_ScreenSaverUnlock/control
rename to client/site_tests/desktopui_ScreenLocker/control
index 0349990be863e5d89eb11f51d16f7ca27e4c680f..993906dfc2c347fa6247ba6eddcaeedc1536ae38 100644
--- a/client/site_tests/desktopui_ScreenSaverUnlock/control
+++ b/client/site_tests/desktopui_ScreenLocker/control
@@ -3,10 +3,11 @@
 # found in the LICENSE file.
 
 AUTHOR = "Chrome OS Team"
-NAME = "desktopui_ScreenSaverUnlock"
-PURPOSE = "Verify screen saver can be unlocked."
+NAME = "desktopui_ScreenLocker"
+PURPOSE = "Verify screen locker is functional."
 CRITERIA = """
-This test will fail if the screen cannot be unlocked with the correct password,
+This test will fail if the screen cannot be locked with ctrl-alt-l, or
+cannot be unlocked with the correct password,
 or if the screen is unlocked with an incorrect password.
 """
 TIME = "SHORT"
@@ -15,9 +16,9 @@ TEST_CLASS = "desktopui"
 TEST_TYPE = "client"
 
 DOC = """
-This test checks if the screen saver can be unlocked
+This test checks if the screen locker can lock and unlock the screen.
 """
 
-job.run_test('desktopui_ScreenSaverUnlock', tag='success', is_control='False')
+job.run_test('desktopui_ScreenLocker')
+
 
-job.run_test('desktopui_ScreenSaverUnlock', tag='control', is_control='True')