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

tools/telemetry/telemetry/core/browser_unittest.py

Index: tools/telemetry/telemetry/core/browser_unittest.py
diff --git a/tools/telemetry/telemetry/core/browser_unittest.py b/tools/telemetry/telemetry/core/browser_unittest.py
index 096064d6a93aa06902cf4683f257e16130c51b0d..018783eda48d82ee837ae464588c904cad50f8d6 100644
--- a/tools/telemetry/telemetry/core/browser_unittest.py
+++ b/tools/telemetry/telemetry/core/browser_unittest.py
@@ -8,7 +8,7 @@ import shutil
 import tempfile
 import unittest
 
-from telemetry import benchmark
+from telemetry import decorators
 from telemetry.core import browser_finder
 from telemetry.core import gpu_device
 from telemetry.core import gpu_info
@@ -33,7 +33,7 @@ class BrowserTest(browser_test_case.BrowserTestCase):
     v = self._browser._browser_backend.chrome_branch_number
     self.assertTrue(v > 0)
 
-  @benchmark.Enabled('has tabs')
+  @decorators.Enabled('has tabs')
   def testNewCloseTab(self):
     existing_tab = self._browser.tabs[0]
     self.assertEquals(1, len(self._browser.tabs))
@@ -57,8 +57,8 @@ class BrowserTest(browser_test_case.BrowserTestCase):
     tab.Navigate(self.UrlOfUnittestFile('blank.html'))
     self._browser.tabs[0].WaitForDocumentReadyStateToBeInteractiveOrBetter()
 
-  @benchmark.Enabled('has tabs')
-  @benchmark.Disabled('win')  # crbug.com/321527
+  @decorators.Enabled('has tabs')
+  @decorators.Disabled('win')  # crbug.com/321527
   def testCloseReferencedTab(self):
     self._browser.tabs.New()
     tab = self._browser.tabs[0]
@@ -66,7 +66,7 @@ class BrowserTest(browser_test_case.BrowserTestCase):
     tab.Close()
     self.assertEquals(1, len(self._browser.tabs))
 
-  @benchmark.Enabled('has tabs')
+  @decorators.Enabled('has tabs')
   def testForegroundTab(self):
     # Should be only one tab at this stage, so that must be the foreground tab
     original_tab = self._browser.tabs[0]
@@ -112,7 +112,7 @@ class BrowserTest(browser_test_case.BrowserTestCase):
   def testGetSystemTotalMemory(self):
     self.assertTrue(self._browser.memory_stats['SystemTotalPhysicalMemory'] > 0)
 
-  @benchmark.Disabled('chromeos') # crbug.com/412713.
+  @decorators.Disabled('chromeos') # crbug.com/412713.
   def testIsTracingRunning(self):
     tracing_controller = self._browser.platform.tracing_controller
     if not tracing_controller.IsChromeTracingSupported(self._browser):
@@ -146,7 +146,7 @@ class DirtyProfileBrowserTest(browser_test_case.BrowserTestCase):
   def CustomizeBrowserOptions(cls, options):
     options.profile_type = 'small_profile'
 
-  @benchmark.Disabled('chromeos')  # crbug.com/243912
+  @decorators.Disabled('chromeos')  # crbug.com/243912
   def testDirtyProfileCreation(self):
     self.assertEquals(1, len(self._browser.tabs))
 
@@ -186,8 +186,8 @@ class BrowserRestoreSessionTest(unittest.TestCase):
     cls._options.browser_options.profile_dir = cls._profile_dir
     cls._browser_to_create = browser_finder.FindBrowser(cls._options)
 
-  @benchmark.Enabled('has tabs')
-  @benchmark.Disabled('chromeos', 'win', 'mac')
+  @decorators.Enabled('has tabs')
+  @decorators.Disabled('chromeos', 'win', 'mac')
   # TODO(nednguyen): Enable this test on windowsn platform
   def testRestoreBrowserWithMultipleTabs(self):
     with self._browser_to_create.Create(self._options) as browser: