Make credential_path a page attribute instead of page_set attribute.

Rationale:
+ This makes _RunPage --> SharedPageState refactoring easier.
+ This enables combining pages from different page_sets.

This patch also modifies page_set_smoke_test.py to make sure that the change doesn't break existing page sets.

BUG=418278

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

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

24 files changed, 52 insertions, 74 deletions

diff --git a/tools/perf/page_sets/calendar_forward_backward.py b/tools/perf/page_sets/calendar_forward_backward.py
index 19037f6..d4f8dea 100644
--- a/tools/perf/page_sets/calendar_forward_backward.py
+++ b/tools/perf/page_sets/calendar_forward_backward.py
@@ -13,8 +13,8 @@ class CalendarForwardBackwardPage(page_module.Page):
     super(CalendarForwardBackwardPage, self).__init__(
       url='https://www.google.com/calendar/',
       page_set=page_set,
-      name='calendar_forward_backward')
-    self.credentials_path = 'data/credentials.json'
+      name='calendar_forward_backward',
+      credentials_path = 'data/credentials.json')
     self.credentials = 'google'
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/calendar_forward_backward.json'
@@ -64,7 +64,6 @@ class CalendarForwardBackwardPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(CalendarForwardBackwardPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/calendar_forward_backward.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/gmail_alt_threadlist_conversation.py b/tools/perf/page_sets/gmail_alt_threadlist_conversation.py
index 5b04573..0b86df6 100644
--- a/tools/perf/page_sets/gmail_alt_threadlist_conversation.py
+++ b/tools/perf/page_sets/gmail_alt_threadlist_conversation.py
@@ -35,8 +35,8 @@ class GmailAltThreadlistConversationPage(
     super(GmailAltThreadlistConversationPage, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set,
-      name='gmail_alt_threadlist_conversation')
-    self.credentials_path = 'data/credentials.json'
+      name='gmail_alt_threadlist_conversation',
+      credentials_path = 'data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/gmail_alt_threadlist_conversation.json'
     self.credentials = 'google'
@@ -66,7 +66,6 @@ class GmailAltThreadlistConversationPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(GmailAltThreadlistConversationPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/gmail_alt_threadlist_conversation.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/gmail_alt_two_labels.py b/tools/perf/page_sets/gmail_alt_two_labels.py
index 36e58bb..17acf61 100644
--- a/tools/perf/page_sets/gmail_alt_two_labels.py
+++ b/tools/perf/page_sets/gmail_alt_two_labels.py
@@ -22,9 +22,8 @@ class GmailAltTwoLabelsPage(page_module.Page):
     super(GmailAltTwoLabelsPage, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set,
-      name='gmail_alt_two_labels')
-
-    self.credentials_path = 'data/credentials.json'
+      name='gmail_alt_two_labels',
+      credentials_path = 'data/credentials.json')
     self.credentials = 'google'
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/gmail_alt_two_labels.json'
@@ -54,7 +53,6 @@ class GmailAltTwoLabelsPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(GmailAltTwoLabelsPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/gmail_alt_two_labels.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/gmail_compose_discard.py b/tools/perf/page_sets/gmail_compose_discard.py
index 4d37bcc..3eedb59 100644
--- a/tools/perf/page_sets/gmail_compose_discard.py
+++ b/tools/perf/page_sets/gmail_compose_discard.py
@@ -24,8 +24,8 @@ class GmailComposeDiscardPage(page_module.Page):
   def __init__(self, page_set):
     super(GmailComposeDiscardPage, self).__init__(
       url='https://mail.google.com/mail/',
-      page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+      page_set=page_set,
+      credentials_path = 'data/credentials.json')
     self.credentials = 'google'
     self.user_agent_type = 'desktop'
 
@@ -66,7 +66,6 @@ class GmailComposeDiscardPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(GmailComposeDiscardPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop')
 
     self.AddPage(GmailComposeDiscardPage(self))
diff --git a/tools/perf/page_sets/gmail_expand_collapse_conversation.py b/tools/perf/page_sets/gmail_expand_collapse_conversation.py
index 8cf222b..836794c 100644
--- a/tools/perf/page_sets/gmail_expand_collapse_conversation.py
+++ b/tools/perf/page_sets/gmail_expand_collapse_conversation.py
@@ -15,8 +15,8 @@ class GmailExpandCollapseConversationPage(
     super(GmailExpandCollapseConversationPage, self).__init__(
       url='https://mail.google.com/mail/u/0/#inbox/13c6a141fa95ffe0',
       page_set=page_set,
-      name='gmail_expand_collapse_conversation')
-    self.credentials_path = 'data/credentials.json'
+      name='gmail_expand_collapse_conversation',
+      credentials_path='data/credentials.json')
     self.credentials = 'google'
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/gmail_expand_collapse_conversation.json'
@@ -47,7 +47,6 @@ class GmailExpandCollapseConversationPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(GmailExpandCollapseConversationPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/gmail_expand_collapse_conversation.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/gmail_refresh.py b/tools/perf/page_sets/gmail_refresh.py
index 477c474..d288963 100644
--- a/tools/perf/page_sets/gmail_refresh.py
+++ b/tools/perf/page_sets/gmail_refresh.py
@@ -12,9 +12,7 @@ class GmailRefreshPage(page_module.Page):
   def __init__(self, page_set):
     super(GmailRefreshPage, self).__init__(
       url='https://mail.google.com/mail/',
-      page_set=page_set)
-
-    self.credentials_path = 'data/credentials.json'
+      page_set=page_set, credentials_path = 'data/credentials.json')
     self.credentials = 'google'
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/gmail_refresh.json'
@@ -31,7 +29,6 @@ class GmailRefreshPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(GmailRefreshPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/gmail_refresh.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/key_desktop_sites.py b/tools/perf/page_sets/key_desktop_sites.py
index 0459313..69dca11 100644
--- a/tools/perf/page_sets/key_desktop_sites.py
+++ b/tools/perf/page_sets/key_desktop_sites.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class KeyDesktopSitesPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(KeyDesktopSitesPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(KeyDesktopSitesPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.archive_data_file = 'data/key_desktop_sites.json'
 
   def RunSmoothness(self, action_runner):
@@ -119,7 +119,6 @@ class KeyDesktopSitesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(KeyDesktopSitesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       archive_data_file='data/key_desktop_sites.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
diff --git a/tools/perf/page_sets/key_mobile_sites.py b/tools/perf/page_sets/key_mobile_sites.py
index b652266..2f058fc 100644
--- a/tools/perf/page_sets/key_mobile_sites.py
+++ b/tools/perf/page_sets/key_mobile_sites.py
@@ -8,9 +8,9 @@ from telemetry.page import page_set as page_set_module
 class KeyMobileSitesPage(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
-    super(KeyMobileSitesPage, self).__init__(url=url, page_set=page_set,
-                                             name=name)
-    self.credentials_path = 'data/credentials.json'
+    super(KeyMobileSitesPage, self).__init__(
+        url=url, page_set=page_set, name=name,
+        credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/key_mobile_sites.json'
 
@@ -458,7 +458,6 @@ class KeyMobileSitesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(KeyMobileSitesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='mobile',
       archive_data_file='data/key_mobile_sites.json',
       bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/key_search_mobile.py b/tools/perf/page_sets/key_search_mobile.py
index 112fe55..d40d772 100644
--- a/tools/perf/page_sets/key_search_mobile.py
+++ b/tools/perf/page_sets/key_search_mobile.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class KeySearchMobilePage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(KeySearchMobilePage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(KeySearchMobilePage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/key_search_mobile.json'
 
@@ -26,7 +26,6 @@ class KeySearchMobilePageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(KeySearchMobilePageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='mobile',
       archive_data_file='data/key_search_mobile.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/key_silk_cases.py b/tools/perf/page_sets/key_silk_cases.py
index 484f155..f3e42ac 100644
--- a/tools/perf/page_sets/key_silk_cases.py
+++ b/tools/perf/page_sets/key_silk_cases.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class KeySilkCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(KeySilkCasesPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(KeySilkCasesPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/key_silk_cases.json'
 
@@ -669,7 +669,6 @@ class KeySilkCasesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(KeySilkCasesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='mobile',
       archive_data_file='data/key_silk_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/mobile_memory.py b/tools/perf/page_sets/mobile_memory.py
index 30ca5cf..17120a6 100644
--- a/tools/perf/page_sets/mobile_memory.py
+++ b/tools/perf/page_sets/mobile_memory.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class MobileMemoryPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(MobileMemoryPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(MobileMemoryPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/mobile_memory.json'
 
@@ -88,7 +88,6 @@ class MobileMemoryPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(MobileMemoryPageSet, self).__init__(
-        credentials_path='data/credentials.json',
         user_agent_type='mobile',
         archive_data_file='data/mobile_memory.json',
         bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/plus_alt_posts_photos.py b/tools/perf/page_sets/plus_alt_posts_photos.py
index 12195f4..93d175d 100644
--- a/tools/perf/page_sets/plus_alt_posts_photos.py
+++ b/tools/perf/page_sets/plus_alt_posts_photos.py
@@ -13,8 +13,8 @@ class PlusAltPostsPhotosPage(page_module.Page):
     super(PlusAltPostsPhotosPage, self).__init__(
       url='https://plus.google.com/+BarackObama/posts',
       page_set=page_set,
-      name='plus_alt_posts_photos')
-    self.credentials_path = 'data/credentials.json'
+      name='plus_alt_posts_photos',
+      credentials_path = 'data/credentials.json')
     self.credentials = 'google'
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/plus_alt_posts_photos.json'
@@ -42,7 +42,6 @@ class PlusAltPostsPhotosPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(PlusAltPostsPhotosPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/plus_alt_posts_photos.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/simple_mobile_sites.py b/tools/perf/page_sets/simple_mobile_sites.py
index c661da8..093766d 100644
--- a/tools/perf/page_sets/simple_mobile_sites.py
+++ b/tools/perf/page_sets/simple_mobile_sites.py
@@ -8,8 +8,10 @@ from telemetry.page import page_set as page_set_module
 class SimplePage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(SimplePage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(SimplePage, self).__init__(
+        url=url,
+        page_set=page_set,
+        credentials_path='data/credentials.json')
     self.archive_data_file = 'data/simple_mobile_sites.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -35,7 +37,6 @@ class SimpleMobileSitesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(SimpleMobileSitesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='tablet_10_inch',
       archive_data_file='data/simple_mobile_sites.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/top_10.py b/tools/perf/page_sets/top_10.py
index 7c70b8e..4297b19 100644
--- a/tools/perf/page_sets/top_10.py
+++ b/tools/perf/page_sets/top_10.py
@@ -7,7 +7,9 @@ from telemetry.page import page_set as page_set_module
 
 class SimpleScrollPage(page_module.Page):
   def __init__(self, url, page_set, credentials='', name=''):
-    super(SimpleScrollPage, self).__init__(url, page_set=page_set, name=name)
+    super(SimpleScrollPage, self).__init__(
+        url, page_set=page_set, name=name,
+        credentials_path='data/credentials.json')
     self.credentials = credentials
 
   def RunSmoothness(self, action_runner):
@@ -90,7 +92,6 @@ class Top10PageSet(page_set_module.PageSet):
   def __init__(self):
     super(Top10PageSet, self).__init__(
       archive_data_file='data/top_10.json',
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       bucket=page_set_module.PARTNER_BUCKET)
 
diff --git a/tools/perf/page_sets/top_10_mobile.py b/tools/perf/page_sets/top_10_mobile.py
index 636368f..4301924 100644
--- a/tools/perf/page_sets/top_10_mobile.py
+++ b/tools/perf/page_sets/top_10_mobile.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class Top10MobilePage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(Top10MobilePage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(Top10MobilePage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/top_10_mobile.json'
 
@@ -26,7 +26,6 @@ class Top10MobilePageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(Top10MobilePageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='mobile',
       archive_data_file='data/top_10_mobile.json',
       bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/top_25.py b/tools/perf/page_sets/top_25.py
index 212292e..4e66b63 100644
--- a/tools/perf/page_sets/top_25.py
+++ b/tools/perf/page_sets/top_25.py
@@ -17,8 +17,9 @@ def _WaitForLocationChange(action_runner, old_href):
 class Top25Page(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
-    super(Top25Page, self).__init__(url=url, page_set=page_set, name=name)
-    self.credentials_path = 'data/credentials.json'
+    super(Top25Page, self).__init__(
+        url=url, page_set=page_set, name=name,
+        credentials_path='data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/top_25.json'
 
@@ -522,7 +523,6 @@ class Top25PageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(Top25PageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/top_25.json',
       bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/top_desktop_sites_2012Q3.py b/tools/perf/page_sets/top_desktop_sites_2012Q3.py
index 8ee3239..30d5a6a 100644
--- a/tools/perf/page_sets/top_desktop_sites_2012Q3.py
+++ b/tools/perf/page_sets/top_desktop_sites_2012Q3.py
@@ -8,9 +8,9 @@ from telemetry.page import page
 class Top2012Q3Page(page.Page):
 
   def __init__(self, url, ps):
-    super(Top2012Q3Page, self).__init__(url=url, page_set=ps)
+    super(Top2012Q3Page, self).__init__(
+        url=url, page_set=ps, credentials_path = 'data/credentials.json')
     self.make_javascript_deterministic = True
-    self.credentials_path = 'data/credentials.json'
     self.archive_data_file = 'data/2012Q3.json'
 
   def ReloadAndGc(self, action_runner):
@@ -35,7 +35,6 @@ class Top2012Q3PageSet(page_set.PageSet):
   def __init__(self):
     super(Top2012Q3PageSet, self).__init__(
       make_javascript_deterministic=True,
-      credentials_path='data/credentials.json',
       archive_data_file='data/2012Q3.json',
       bucket=page_set.PARTNER_BUCKET)
 
diff --git a/tools/perf/page_sets/tough_compositor_cases.py b/tools/perf/page_sets/tough_compositor_cases.py
index 2a44922..9835981 100644
--- a/tools/perf/page_sets/tough_compositor_cases.py
+++ b/tools/perf/page_sets/tough_compositor_cases.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class ToughCompositorPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(ToughCompositorPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(ToughCompositorPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/tough_compositor_cases.json'
 
@@ -46,7 +46,6 @@ class ToughCompositorCasesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(ToughCompositorCasesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='mobile',
       archive_data_file='data/tough_compositor_cases.json',
       bucket=page_set_module.PUBLIC_BUCKET)
diff --git a/tools/perf/page_sets/tough_energy_cases.py b/tools/perf/page_sets/tough_energy_cases.py
index 9606157..b33278e 100644
--- a/tools/perf/page_sets/tough_energy_cases.py
+++ b/tools/perf/page_sets/tough_energy_cases.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class ToughEnergyCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(ToughEnergyCasesPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(ToughEnergyCasesPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
 
 class CodePenPage(ToughEnergyCasesPage):
 
@@ -39,8 +39,7 @@ class ToughEnergyCasesPageSet(page_set_module.PageSet):
   def __init__(self):
     super(ToughEnergyCasesPageSet, self).__init__(
         archive_data_file='data/tough_energy_cases.json',
-        bucket=page_set_module.PUBLIC_BUCKET,
-        credentials_path='data/credentials.json')
+        bucket=page_set_module.PUBLIC_BUCKET)
 
     # Why: productivity, top google properties
     self.AddPage(GooglePage('https://mail.google.com/mail/', self))
diff --git a/tools/perf/page_sets/tough_layer_cases.py b/tools/perf/page_sets/tough_layer_cases.py
index bd0a1a7..5aedde9 100644
--- a/tools/perf/page_sets/tough_layer_cases.py
+++ b/tools/perf/page_sets/tough_layer_cases.py
@@ -20,4 +20,3 @@ class ToughLayerCasesPageSet(page_set_module.PageSet):
 
     self.AddPage(ToughLayerCasesPage(
       'file://layer_stress_tests/opacity.html', self))
-
diff --git a/tools/perf/page_sets/tough_layout_cases.py b/tools/perf/page_sets/tough_layout_cases.py
index feab418..27bb6fa 100644
--- a/tools/perf/page_sets/tough_layout_cases.py
+++ b/tools/perf/page_sets/tough_layout_cases.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class ToughLayoutCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(ToughLayoutCasesPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(ToughLayoutCasesPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/tough_layout_cases.json'
 
@@ -28,7 +28,6 @@ class ToughLayoutCasesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(ToughLayoutCasesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/tough_layout_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/tough_memory_multi_tab.py b/tools/perf/page_sets/tough_memory_multi_tab.py
index 60f6f51..d3a6c83 100644
--- a/tools/perf/page_sets/tough_memory_multi_tab.py
+++ b/tools/perf/page_sets/tough_memory_multi_tab.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class ToughMemoryMultiTabPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(ToughMemoryMultiTabPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(ToughMemoryMultiTabPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/key_mobile_sites.json'
 
@@ -20,7 +20,6 @@ class ToughMemoryMultiTabPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(ToughMemoryMultiTabPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='mobile',
       archive_data_file='data/key_mobile_sites.json')
 
diff --git a/tools/perf/page_sets/tough_pinch_zoom_cases.py b/tools/perf/page_sets/tough_pinch_zoom_cases.py
index 917c5e6..a11f4a4 100644
--- a/tools/perf/page_sets/tough_pinch_zoom_cases.py
+++ b/tools/perf/page_sets/tough_pinch_zoom_cases.py
@@ -8,9 +8,9 @@ from telemetry.page import page_set as page_set_module
 class ToughPinchZoomCasesPage(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
-    super(ToughPinchZoomCasesPage, self).__init__(url=url, page_set=page_set,
-                                                  name=name)
-    self.credentials_path = 'data/credentials.json'
+    super(ToughPinchZoomCasesPage, self).__init__(
+        url=url, page_set=page_set, name=name,
+        credentials_path = 'data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/tough_pinch_zoom_cases.json'
 
@@ -246,7 +246,6 @@ class ToughPinchZoomCasesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(ToughPinchZoomCasesPageSet, self).__init__(
-      credentials_path='data/credentials.json',
       user_agent_type='desktop',
       archive_data_file='data/tough_pinch_zoom_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
diff --git a/tools/perf/page_sets/tough_scheduling_cases.py b/tools/perf/page_sets/tough_scheduling_cases.py
index ec951de..7b322f5 100644
--- a/tools/perf/page_sets/tough_scheduling_cases.py
+++ b/tools/perf/page_sets/tough_scheduling_cases.py
@@ -8,8 +8,8 @@ from telemetry.page import page_set as page_set_module
 class ToughSchedulingCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
-    super(ToughSchedulingCasesPage, self).__init__(url=url, page_set=page_set)
-    self.credentials_path = 'data/credentials.json'
+    super(ToughSchedulingCasesPage, self).__init__(
+        url=url, page_set=page_set, credentials_path = 'data/credentials.json')
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/tough_scheduling_cases.json'
 
@@ -376,7 +376,6 @@ class ToughSchedulingCasesPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(ToughSchedulingCasesPageSet, self).__init__(
-        credentials_path='data/credentials.json',
         user_agent_type='mobile',
         archive_data_file='data/tough_scheduling_cases.json',
         bucket=page_set_module.INTERNAL_BUCKET)