Re-enable some PCv1 benchmarks for CrOS

tools/perf/benchmarks/page_cycler.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from core import perf_benchmark
 
 from measurements import page_cycler
 import page_sets
 from telemetry import benchmark
 
@@ skipping 17 matching lines @@
     return cls.cold_load_percent > 0 or not is_first_result
 
   def CreatePageTest(self, options):
     return page_cycler.PageCycler(
         page_repeat=options.page_repeat,
         pageset_repeat=options.pageset_repeat,
         cold_load_percent=self.cold_load_percent,
         report_speed_index=options.report_speed_index)
 
 
+@benchmark.Enabled('chromeos')
+class PageCyclerIntlArFaHe(_PageCycler):
+  """Page load time for a variety of pages in Arabic, Farsi and Hebrew.
+
+  Runs against pages recorded in April, 2013.
+  """
+  page_set = page_sets.IntlArFaHePageSet
+
+  @classmethod
+  def Name(cls):
+    return 'page_cycler.intl_ar_fa_he'
+
+
+@benchmark.Enabled('chromeos')
+class PageCyclerIntlEsFrPtBr(_PageCycler):
+  """Page load time for a pages in Spanish, French and Brazilian Portuguese.
+
+  Runs against pages recorded in April, 2013.
+  """
+  page_set = page_sets.IntlEsFrPtBrPageSet
+
+  @classmethod
+  def Name(cls):
+    return 'page_cycler.intl_es_fr_pt-BR'
+
+
 class PageCyclerIntlHiRu(_PageCycler):
   """Page load time benchmark for a variety of pages in Hindi and Russian.
 
   Runs against pages recorded in April, 2013.
   """
   page_set = page_sets.IntlHiRuPageSet
 
   @classmethod
   def Name(cls):
     return 'page_cycler.intl_hi_ru'
 
 
+@benchmark.Enabled('chromeos')
+class PageCyclerIntlJaZh(_PageCycler):
+  """Page load time benchmark for a variety of pages in Japanese and Chinese.
+
+  Runs against pages recorded in April, 2013.
+  """
+  page_set = page_sets.IntlJaZhPageSet
+
+  @classmethod
+  def Name(cls):
+    return 'page_cycler.intl_ja_zh'
+
+  @classmethod
+  def ValueCanBeAddedPredicate(cls, value, is_first_result):
+    # Filter out vm_private_dirty_final_renderer
+    # crbug.com/551522
+    print '**** %s ***' % value.name
+    filtered_name = (
+        'vm_private_dirty_final_renderer.vm_private_dirty_final_renderer')
+    return (super(PageCyclerIntlJaZh, cls).ValueCanBeAddedPredicate(
+        value, is_first_result) and value.name != filtered_name)
+
+
 class PageCyclerIntlKoThVi(_PageCycler):
   """Page load time for a variety of pages in Korean, Thai and Vietnamese.
 
   Runs against pages recorded in April, 2013.
   """
   page_set = page_sets.IntlKoThViPageSet
 
   @classmethod
   def Name(cls):
     return 'page_cycler.intl_ko_th_vi'
@@ skipping 89 matching lines @@
   set, without running in out-of-process iframes mode.. """
   page_set = page_sets.OopifBasicPageSet
 
   @classmethod
   def Name(cls):
     return 'page_cycler.basic_oopif'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/607657