Telemetry no longer supports credential files so remove support

NoTry: true
Bug: skia:7401
Change-Id: I18b2dfe92b6e998d0799ed95cd5d735706428d1c
Reviewed-on: https://skia-review.googlesource.com/84540
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

27 files changed, 5 insertions, 63 deletions

diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index 85c813f05d..9e0670ad0a 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_carsvg_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index acf8ef3c77..77d249d5ab 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_chalkboard_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py
index fa6d7b6833..594faf1560 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_css3gradients_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index b42d5f8b4b..bbf4bf5b65 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_digg_nexus10.json'
 
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index 725f33087c..aae4e3c615 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_espn_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index 256de8c5b6..638b752172 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_gamedeksiam_nexus10.json'
 
diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py
index 8800dad9bd..fdc06acc4b 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -16,10 +16,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_gmail_nexus10.json'
-    self.credentials = 'google'
 
   def RunSmoothness(self, action_runner):
     action_runner.ScrollElement()
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index e7d0bc8368..83b3eedbbb 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 # pylint: disable=W0401,W0614
 
+from page_sets.login_helpers import google_login
 
 from telemetry import story
 from telemetry.page import page as page_module
@@ -16,10 +17,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_gmailthread_desktop.json'
-    self.credentials = 'google'
 
   def RunSmoothness(self, action_runner):
     action_runner.ScrollElement()
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index 9cfee02c9c..041a3150ca 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_googlehome_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index c85d1e8f03..f9b944eb0e 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_googlespreadsheet_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index 43be5de121..49fde1876b 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_jsfiddlebigcar_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index 1a1af34905..e1694c49df 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_mapsvg_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index fea443d165..4998766e4a 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_mozilla_nexus10.json'
 
diff --git a/tools/skp/page_sets/skia_nytimes_desktop.py b/tools/skp/page_sets/skia_nytimes_desktop.py
index aab0abbf63..9124965de5 100644
--- a/tools/skp/page_sets/skia_nytimes_desktop.py
+++ b/tools/skp/page_sets/skia_nytimes_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_nytimes_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index 4f14a20483..ae9d1e0b5f 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_pokemonwiki_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index b2db40645d..e6560cece8 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_pravda_nexus10.json'
 
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index ce831d79d3..6689ffdcd5 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_samoasvg_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_theverge_desktop.py b/tools/skp/page_sets/skia_theverge_desktop.py
index a95ade3baf..107e404224 100644
--- a/tools/skp/page_sets/skia_theverge_desktop.py
+++ b/tools/skp/page_sets/skia_theverge_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_theverge_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_tiger8svg_desktop.py b/tools/skp/page_sets/skia_tiger8svg_desktop.py
index 127fa2af02..93e87e0fee 100644
--- a/tools/skp/page_sets/skia_tiger8svg_desktop.py
+++ b/tools/skp/page_sets/skia_tiger8svg_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_tiger8svg_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index 26c1a015a6..9d14e30854 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_tigersvg_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_ugamsolutions_desktop.py b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
index 24aac58248..861a8e6e41 100644
--- a/tools/skp/page_sets/skia_ugamsolutions_desktop.py
+++ b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_ugamsolutions_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_unicodetable_desktop.py b/tools/skp/page_sets/skia_unicodetable_desktop.py
index 2b76f60139..da01e1014e 100644
--- a/tools/skp/page_sets/skia_unicodetable_desktop.py
+++ b/tools/skp/page_sets/skia_unicodetable_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_unicodetable_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_wikipedia_desktop.py b/tools/skp/page_sets/skia_wikipedia_desktop.py
index c6188b1f50..363d697319 100644
--- a/tools/skp/page_sets/skia_wikipedia_desktop.py
+++ b/tools/skp/page_sets/skia_wikipedia_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_wikipedia_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py
index d425c726e8..7d10c3e93e 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_worldjournal_nexus10.json'
 
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index a036a572bb..0372d1e211 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_wowwiki_desktop.json'
 
diff --git a/tools/skp/page_sets/skia_ynevsvg_desktop.py b/tools/skp/page_sets/skia_ynevsvg_desktop.py
index 814d5d2897..7950f160d5 100644
--- a/tools/skp/page_sets/skia_ynevsvg_desktop.py
+++ b/tools/skp/page_sets/skia_ynevsvg_desktop.py
@@ -16,7 +16,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         name=url,
         page_set=page_set,
-        credentials_path='data/credentials.json',
         shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_ynevsvg_desktop.json'
 
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py
index 6a8562b158..e8dcc62b7e 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -33,11 +33,10 @@ The --browser_executable flag should point to the browser binary you want to use
 to capture archives and/or capture SKP files. Majority of the time it should be
 a newly built chrome binary.
 
-The --data_store flag controls where the needed artifacts, such as
-credential files, are downloaded from. It also controls where the
-generated artifacts, such as recorded webpages and resulting skp renderings,
-are uploaded to. URLs with scheme 'gs://' use Google Storage. Otherwise
-use local filesystem.
+The --data_store flag controls where the needed artifacts are downloaded from.
+It also controls where the generated artifacts, such as recorded webpages and
+resulting skp renderings, are uploaded to. URLs with scheme 'gs://' use Google
+Storage. Otherwise use local filesystem.
 
 The --upload=True flag means generated artifacts will be
 uploaded or copied to the location specified by --data_store. (default value is
@@ -76,13 +75,6 @@ LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data')
 TMP_SKP_DIR = tempfile.mkdtemp()
 
-# Location of the credentials.json file and the string that represents missing
-# passwords.
-CREDENTIALS_FILE_PATH = os.path.join(
-    os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data',
-    'credentials.json'
-)
-
 # Name of the SKP benchmark
 SKP_BENCHMARK = 'skpicture_printer'
 
@@ -101,9 +93,6 @@ RETRY_RECORD_WPR_COUNT = 5
 # How many times the run_benchmark binary should be retried.
 RETRY_RUN_MEASUREMENT_COUNT = 3
 
-# Location of the credentials.json file in Google Storage.
-CREDENTIALS_GS_PATH = 'playback/credentials/credentials.json'
-
 X11_DISPLAY = os.getenv('DISPLAY', ':0')
 
 # Path to Chromium's page sets.
@@ -199,26 +188,6 @@ class SkPicturePlayback(object):
   def Run(self):
     """Run the SkPicturePlayback BuildStep."""
 
-    # Download the credentials file if it was not previously downloaded.
-    if not os.path.isfile(CREDENTIALS_FILE_PATH):
-      # Download the credentials.json file from Google Storage.
-      self.gs.download_file(CREDENTIALS_GS_PATH, CREDENTIALS_FILE_PATH)
-
-    if not os.path.isfile(CREDENTIALS_FILE_PATH):
-      print """\n\nCould not locate credentials file in the storage.
-      Please create a %s file that contains:
-      {
-        "google": {
-          "username": "google_testing_account_username",
-          "password": "google_testing_account_password"
-        },
-        "facebook": {
-          "username": "facebook_testing_account_username",
-          "password": "facebook_testing_account_password"
-        }
-      }\n\n""" % CREDENTIALS_FILE_PATH
-      raw_input("Please press a key when you are ready to proceed...")
-
     # Delete any left over data files in the data directory.
     for archive_file in glob.glob(
         os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, 'skia_*')):