Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / perf / benchmarks / media.py

diff --git a/src/tools/perf/benchmarks/media.py b/src/tools/perf/benchmarks/media.py
index dba1b2f..f881547 100644 (file)
--- a/src/tools/perf/benchmarks/media.py
+++ b/src/tools/perf/benchmarks/media.py
@@ -23,53 +23,54 @@ class _MSEMeasurement(page_measurement.PageMeasurement):
 class Media(test.Test):
   """Obtains media metrics for key user scenarios."""
   test = media.Media
-  page_set = 'page_sets/tough_video_cases.json'
+  page_set = 'page_sets/tough_video_cases.py'
 
 
-@test.Disabled('mac')  # http://crbug.com/353268
 class MediaNetworkSimulation(test.Test):
   """Obtains media metrics under different network simulations."""
   test = media.Media
-  page_set = 'page_sets/media_cns_cases.json'
+  page_set = 'page_sets/media_cns_cases.py'
 
 
 class MediaAndroid(test.Test):
   """Obtains media metrics for key user scenarios on Android."""
   test = media.Media
   tag = 'android'
-  page_set = 'page_sets/tough_video_cases.json'
-  # Exclude 4k and 50 fps media files (garden* & crowd*).
-  options = {'page_label_filter_exclude': '4k,50fps'}
+  page_set = 'page_sets/tough_video_cases.py'
+  # Exclude is_4k and 50 fps media files (garden* & crowd*).
+  options = {'page_label_filter_exclude': 'is_4k,is_50fps'}
 
 
 class MediaChromeOS4kOnly(test.Test):
-  """Benchmark for media performance on ChromeOS using only 4k test content."""
+  """Benchmark for media performance on ChromeOS using only is_4k test content.
+  """
   test = media.Media
   tag = 'chromeOS4kOnly'
-  page_set = 'page_sets/tough_video_cases.json'
+  page_set = 'page_sets/tough_video_cases.py'
   options = {
-      'page_label_filter': '4k',
-      # Exclude 50fps test files: crbug/331816
-      'page_label_filter_exclude': '50fps'
+      'page_label_filter': 'is_4k',
+      # Exclude is_50fps test files: crbug/331816
+      'page_label_filter_exclude': 'is_50fps'
   }
 
 
 class MediaChromeOS(test.Test):
   """Benchmark for media performance on all ChromeOS platforms.
 
-  This benchmark does not run 4k content, there's a separate benchmark for that.
+  This benchmark does not run is_4k content, there's a separate benchmark for
+  that.
   """
   test = media.Media
   tag = 'chromeOS'
-  page_set = 'page_sets/tough_video_cases.json'
-  # Exclude 50fps test files: crbug/331816
-  options = {'page_label_filter_exclude': '4k,50fps'}
+  page_set = 'page_sets/tough_video_cases.py'
+  # Exclude is_50fps test files: crbug/331816
+  options = {'page_label_filter_exclude': 'is_4k,is_50fps'}
 
 
 class MediaSourceExtensions(test.Test):
   """Obtains media metrics for key media source extensions functions."""
   test = _MSEMeasurement
-  page_set = 'page_sets/mse_cases.json'
+  page_set = 'page_sets/mse_cases.py'
 
   def CustomizeBrowserOptions(self, options):
     # Needed to allow XHR requests to return stream objects.