Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / browser_unittest.py

diff --git a/src/tools/telemetry/telemetry/core/browser_unittest.py b/src/tools/telemetry/telemetry/core/browser_unittest.py
index a75372d..512bd42 100644 (file)
--- a/src/tools/telemetry/telemetry/core/browser_unittest.py
+++ b/src/tools/telemetry/telemetry/core/browser_unittest.py
@@ -8,6 +8,8 @@ from telemetry import benchmark
 from telemetry.core import gpu_device
 from telemetry.core import gpu_info
 from telemetry.core import system_info
+from telemetry.core.platform import tracing_category_filter
+from telemetry.core.platform import tracing_options
 from telemetry.unittest import browser_test_case
 
 
@@ -102,14 +104,19 @@ class BrowserTest(browser_test_case.BrowserTestCase):
   def testGetSystemTotalMemory(self):
     self.assertTrue(self._browser.memory_stats['SystemTotalPhysicalMemory'] > 0)
 
+  @benchmark.Disabled('chromeos') # crbug.com/412713.
   def testIsTracingRunning(self):
-    if not self._browser.supports_tracing:
+    tracing_controller = self._browser.platform.tracing_controller
+    if not tracing_controller.IsChromeTracingSupported(self._browser):
       return
-    self.assertFalse(self._browser.is_tracing_running)
-    self._browser.StartTracing()
-    self.assertTrue(self._browser.is_tracing_running)
-    self._browser.StopTracing()
-    self.assertFalse(self._browser.is_tracing_running)
+    self.assertFalse(tracing_controller.is_tracing_running)
+    options = tracing_options.TracingOptions()
+    options.enable_chrome_trace = True
+    category_filter = tracing_category_filter.TracingCategoryFilter()
+    tracing_controller.Start(options, category_filter)
+    self.assertTrue(tracing_controller.is_tracing_running)
+    tracing_controller.Stop()
+    self.assertFalse(tracing_controller.is_tracing_running)
 
 
 class CommandLineBrowserTest(browser_test_case.BrowserTestCase):