Replaced @benchmark.Enabled/Disabled and @test.Enabled/Disabled with @decorators.Enabled/Disabled i…

tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py

Index: tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py
index f67752fd082dab9a0d55e044acfb0edf5e39f11c..ec718dbf880bfebeb05f0deba15e2228d489d927 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_unittest.py
@@ -4,14 +4,14 @@
 
 import logging
 
-from telemetry import benchmark
+from telemetry import decorators
 from telemetry.core import exceptions
 from telemetry.core import util
 from telemetry.core.backends.chrome import cros_test_case
 
 
 class CrOSCryptohomeTest(cros_test_case.CrOSTestCase):
-  @benchmark.Enabled('chromeos')
+  @decorators.Enabled('chromeos')
   def testCryptohome(self):
     """Verifies cryptohome mount status for regular and guest user and when
     logged out"""
@@ -36,7 +36,7 @@ class CrOSCryptohomeTest(cros_test_case.CrOSTestCase):
 
 
 class CrOSLoginTest(cros_test_case.CrOSTestCase):
-  @benchmark.Enabled('chromeos')
+  @decorators.Enabled('chromeos')
   def testLoginStatus(self):
     """Tests autotestPrivate.loginStatus"""
     if self._is_guest:
@@ -50,7 +50,7 @@ class CrOSLoginTest(cros_test_case.CrOSTestCase):
       self.assertEquals(login_status['email'], self._username)
       self.assertFalse(login_status['isScreenLocked'])
 
-  @benchmark.Enabled('chromeos')
+  @decorators.Enabled('chromeos')
   def testLogout(self):
     """Tests autotestPrivate.logout"""
     if self._is_guest:
@@ -64,7 +64,7 @@ class CrOSLoginTest(cros_test_case.CrOSTestCase):
         pass
       util.WaitFor(lambda: not self._IsCryptohomeMounted(), 20)
 
-  @benchmark.Enabled('chromeos')
+  @decorators.Enabled('chromeos')
   def testGaiaLogin(self):
     """Tests gaia login. Credentials are expected to be found in a
     credentials.txt file, with a single line of format username:password."""
@@ -121,7 +121,7 @@ class CrOSScreenLockerTest(cros_test_case.CrOSTestCase):
     util.WaitFor(lambda: not browser.oobe_exists, 10)
     self.assertFalse(self._IsScreenLocked(browser))
 
-  @benchmark.Disabled
+  @decorators.Disabled
   def testScreenLock(self):
     """Tests autotestPrivate.screenLock"""
     if self._is_guest: