Kill page.disabled field.

If someone wants to disable a page, the right way to
do it is comment out the "self.AddPage(...)" in page_set.__init__().

BUG=

Review URL: https://codereview.chromium.org/616693002

Cr-Commit-Position: refs/heads/master@{#297348}

tools/perf/benchmarks/benchmark_unittest.py

@@ -36,10 +36,9 @@ def SmokeTestGenerator(benchmark):
         # pylint: disable=E1002
         ps = super(SinglePageBenchmark, self).CreatePageSet(options)
         for p in ps.pages:
-          if not p.disabled:
-            p.skip_waits = True
-            ps.pages = [p]
-            break
+          p.skip_waits = True
+          ps.pages = [p]
+          break
         return ps
 
     # Set the benchmark's default arguments.

tools/perf/page_sets/key_mobile_sites.py

@@ -210,7 +210,6 @@ class Page13(KeyMobileSitesPage):
       url='http://twitter.com/katyperry',
       page_set=page_set,
       name='Twitter')
-    self.disabled = 'Forbidden (Rate Limit Exceeded)'
 
 
 class Page14(KeyMobileSitesPage):
@@ -233,7 +232,6 @@ class Page15(KeyMobileSitesPage):
       url='http://espn.go.com',
       page_set=page_set,
       name='ESPN')
-    self.disabled = 'Fails often; crbug.com/249722'
 
 
 class Page16(KeyMobileSitesPage):
@@ -328,8 +326,6 @@ class Page21(KeyMobileSitesPage):
       url='http://groupcloned.com',
       page_set=page_set)
 
-    self.disabled = ('Page behaves non-deterministically, replaced with test'
-                     'version for now')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
@@ -390,8 +386,6 @@ class Page23(KeyMobileSitesPage):
       url='http://forecast.io',
       page_set=page_set)
 
-    self.disabled = u"Doesn't scroll; crbug.com/249736"
-
 
 class Page24(KeyMobileSitesPage):
 
@@ -481,19 +475,24 @@ class KeyMobileSitesPageSet(page_set_module.PageSet):
     self.AddPage(Page10(self))
     self.AddPage(Page11(self))
     self.AddPage(Page12(self))
-#    self.AddPage(Page13(self))
+    # Forbidden (Rate Limit Exceeded)
+    # self.AddPage(Page13(self))
     self.AddPage(Page14(self))
-#    self.AddPage(Page15(self))
+    # Fails often; crbug.com/249722'
+    # self.AddPage(Page15(self))
     self.AddPage(Page16(self))
     self.AddPage(Page17(self))
     self.AddPage(Page18(self))
     self.AddPage(Page19(self))
     self.AddPage(Page20(self))
-    self.AddPage(Page21(self))
-#    mean_input_event_latency cannot be tracked correctly for Page22.
-#    See crbug.com/409086.
-#    self.AddPage(Page22(self))
-#    self.AddPage(Page23(self))
+    # Page behaves non-deterministically, replaced with test version for now.
+    # self.AddPage(Page21(self))
+    # mean_input_event_latency cannot be tracked correctly for Page22.
+    # See crbug.com/409086.
+    # self.AddPage(Page22(self))
+    # self.AddPage(Page23(self))
+    # Doesn't scroll; crbug.com/249736
+    # self.AddPage(Page23(self))
     self.AddPage(Page24(self))
     self.AddPage(Page25(self))
     self.AddPage(Page26(self))

tools/perf/page_sets/key_silk_cases.py

@@ -466,7 +466,6 @@ class Page22(KeySilkCasesPage):
       url='http://plus.google.com/app/basic/stream',
       page_set=page_set)
 
-    self.disabled = 'Times out on Windows; crbug.com/338838'
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
@@ -682,7 +681,8 @@ class KeySilkCasesPageSet(page_set_module.PageSet):
     self.AddPage(Page20(self))
     self.AddPage(GwsGoogleExpansion(self))
     self.AddPage(GwsBoogieExpansion(self))
-    self.AddPage(Page22(self))
+    # Times out on Windows; crbug.com/338838
+    # self.AddPage(Page22(self))
     self.AddPage(Page23(self))
     self.AddPage(Page24(self))
     self.AddPage(Page25(self))

tools/perf/page_sets/tough_canvas_cases.py

@@ -28,8 +28,6 @@ class MicrosofFirefliesPage(ToughCanvasCasesPage):
       url='http://ie.microsoft.com/testdrive/Performance/Fireflies/Default.html',
       page_set=page_set)
 
-    self.disabled = 'Crashes on Galaxy Nexus. crbug.com/314131'
-
 
 class ToughCanvasCasesPageSet(page_set_module.PageSet):
 
@@ -42,7 +40,8 @@ class ToughCanvasCasesPageSet(page_set_module.PageSet):
       archive_data_file='data/tough_canvas_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(MicrosofFirefliesPage(self))
+    # Crashes on Galaxy Nexus. crbug.com/314131
+    # self.AddPage(MicrosofFirefliesPage(self))
 
     # Failing on Nexus 5 (http://crbug.com/364248):
     # 'http://geoapis.appspot.com/agdnZW9hcGlzchMLEgtFeGFtcGxlQ29kZRjh1wIM',

tools/telemetry/telemetry/page/__init__.py

@@ -28,7 +28,6 @@ class Page(object):
     self.synthetic_delays = dict()
     self.startup_url = page_set.startup_url if page_set else ''
     self.credentials = None
-    self.disabled = False
     self.skip_waits = False
     self.script_to_evaluate_on_commit = None
     self._SchemeErrorCheck()

tools/telemetry/telemetry/page/page_runner.py

@@ -433,7 +433,7 @@ def _ShuffleAndFilterPageSet(page_set, finder_options):
   if finder_options.pageset_shuffle_order_file:
     return page_set.ReorderPageSet(finder_options.pageset_shuffle_order_file)
   pages = [page for page in page_set.pages[:]
-           if not page.disabled and page_filter.PageFilter.IsSelected(page)]
+           if page_filter.PageFilter.IsSelected(page)]
   if finder_options.pageset_shuffle:
     random.shuffle(pages)
   return pages

tools/telemetry/telemetry/unittest/page_set_smoke_test.py

@@ -53,14 +53,14 @@ class PageSetSmokeTest(unittest.TestCase):
         except browser_credentials.CredentialsError:
           self.fail(fail_message)
 
-  def CheckTypes(self, page_set):
+  def CheckAttributes(self, page_set):
     """Verify that page_set and its page's base attributes have the right types.
     """
-    self.CheckTypesOfPageSetBasicAttributes(page_set)
+    self.CheckAttributesOfPageSetBasicAttributes(page_set)
     for page in page_set.pages:
-      self.CheckTypesOfPageBasicAttributes(page)
+      self.CheckAttributesOfPageBasicAttributes(page)
 
-  def CheckTypesOfPageSetBasicAttributes(self, page_set):
+  def CheckAttributesOfPageSetBasicAttributes(self, page_set):
     if page_set.file_path is not None:
       self.assertTrue(
           isinstance(page_set.file_path, str),
@@ -83,7 +83,8 @@ class PageSetSmokeTest(unittest.TestCase):
         isinstance(page_set.startup_url, str),
         msg='page_set\'s startup_url must have type string')
 
-  def CheckTypesOfPageBasicAttributes(self, page):
+  def CheckAttributesOfPageBasicAttributes(self, page):
+    self.assertTrue(not hasattr(page, 'disabled'))
     self.assertTrue(
        isinstance(page.url, str),
        msg='page %s \'s url must have type string' % page.display_name)
@@ -104,8 +105,11 @@ class PageSetSmokeTest(unittest.TestCase):
     page_sets = discover.DiscoverClasses(page_sets_dir, top_level_dir,
                                          page_set_module.PageSet).values()
     for page_set_class in page_sets:
-      page_set = page_set_class()
+      try:
+        page_set = page_set_class()
+      except TypeError:
+        continue
       logging.info('Testing %s', page_set.file_path)
       self.CheckArchive(page_set)
       self.CheckCredentials(page_set)
-      self.CheckTypes(page_set)
+      self.CheckAttributes(page_set)