[PCv2] migrate page_cycler_v2.intl_ja_zh

tools/perf/benchmarks/page_cycler_v2.py

Index: tools/perf/benchmarks/page_cycler_v2.py
diff --git a/tools/perf/benchmarks/page_cycler_v2.py b/tools/perf/benchmarks/page_cycler_v2.py
index 3571b73edcebf2d28a4e2b46e24957b3be800e2a..3616662ac77ca48a9aa47fe9eaf1dd9ffd6b062b 100644
--- a/tools/perf/benchmarks/page_cycler_v2.py
+++ b/tools/perf/benchmarks/page_cycler_v2.py
@@ -16,7 +16,8 @@ from telemetry.page import cache_temperature
 from telemetry.timeline import tracing_category_filter
 from telemetry.web_perf import timeline_based_measurement
 

[nednguyen, 2016/06/27 04:33:48]

nits: 2 blank lines between top level definitions

[kouhei (in TOK), 2016/06/27 04:37:01]

Done.

-
+# crbug.com/619254
+@benchmark.Disabled('reference')
 class _PageCyclerV2(perf_benchmark.PerfBenchmark):
   def CreateTimelineBasedMeasurementOptions(self):
     cat_filter = tracing_category_filter.TracingCategoryFilter(
@@ -31,8 +32,15 @@ class _PageCyclerV2(perf_benchmark.PerfBenchmark):
     tbm_options.SetTimelineBasedMetric('firstPaintMetric')
     return tbm_options
 
-# crbug.com/619254
-@benchmark.Disabled('reference')
+  @classmethod
+  def ShouldDisable(cls, possible_browser):
+    # crbug.com/616781
+    if (cls.IsSvelte(possible_browser) or
+        possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X' or
+        possible_browser.platform.GetDeviceTypeName() == 'AOSP on BullHead'):
+      return True
+    return False
+

[nednguyen, 2016/06/27 04:33:48]

Same here

[kouhei (in TOK), 2016/06/27 04:37:01]

Done.

 class PageCyclerV2Typical25(_PageCyclerV2):
   """Page load time benchmark for a 25 typical web pages.
 
@@ -45,16 +53,22 @@ class PageCyclerV2Typical25(_PageCyclerV2):
   def Name(cls):
     return 'page_cycler_v2.typical_25'
 
-  @classmethod
-  def ShouldDisable(cls, possible_browser):
-    # crbug.com/616781
-    if (cls.IsSvelte(possible_browser) or
-        possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X' or
-        possible_browser.platform.GetDeviceTypeName() == 'AOSP on BullHead'):
-      return True
-    return False
-
   def CreateStorySet(self, options):
     return page_sets.Typical25PageSet(run_no_page_interactions=True,
         cache_temperatures=[
           cache_temperature.PCV1_COLD, cache_temperature.PCV1_WARM])
+

[nednguyen, 2016/06/27 04:33:48]

ditto

[kouhei (in TOK), 2016/06/27 04:37:01]

Done.

+class PageCyclerIntlJaZh(_PageCyclerV2):

[nednguyen, 2016/06/27 04:33:48]

You will want to make sure that this is named PageCyclerV2IntlJaZh, otherwise
telemetry code that discovers benchmarks get confused since it discovers all
classes indexed by their names.

I will add a test coverage to make sure that no two benchmark has same class
names due to this limitation.

[kouhei (in TOK), 2016/06/27 04:37:01]

Done.

+  """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_v2.intl_ja_zh'
+
+  def CreateStorySet(self, options):
+    return page_sets.IntlJaZhPageSet(cache_temperatures=[
+          cache_temperature.PCV1_COLD, cache_temperature.PCV1_WARM])