Fixes to CT's trybot recipe

scripts/slave/recipe_modules/skia/resources/trigger_wait_ct_task.py

 #!/usr/bin/env python
 # Copyright (c) 2015 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.
 
 """Python utility that triggers and waits for tasks to complete on CTFE."""
 
 import base64
 import hashlib
 import json
 import optparse
 import requests
 import sys
 import time
 
 
-CTFE_HOST = "http://ct.skia.org"
+CTFE_HOST = "https://ct.skia.org"
 CTFE_QUEUE = CTFE_HOST + '/queue/'
 CHROMIUM_PERF_TASK_POST_URI = CTFE_HOST + "/_/webhook_add_chromium_perf_task"
 GET_CHROMIUM_PERF_RUN_STATUS_URI = CTFE_HOST + "/get_chromium_perf_run_status"
 CHROMIUM_PERF_RUNS_HISTORY = CTFE_HOST + "/chromium_perf_runs/"
 GCE_WEBHOOK_SALT_METADATA_URI = (
     "http://metadata/computeMetadata/v1/project/attributes/"
     "webhook_request_salt")
 
 
 POLLING_FREQUENCY_SECS = 60  # 1 minute.
@@ skipping 28 matching lines @@
 
 
 def _GetWebhookSaltFromMetadata():
   """Gets webhook_request_salt from GCE's metadata server."""
   headers = {"Metadata-Flavor": "Google"}
   resp = requests.get(GCE_WEBHOOK_SALT_METADATA_URI, headers=headers)
   if resp.status_code != 200:
       raise CtTrybotException(
           'Return code from %s was %s' % (GCE_WEBHOOK_SALT_METADATA_URI,
                                           resp.status_code))
-  return resp.text
+  return base64.standard_b64decode(resp.text)
 
 
 def _TriggerTask(options):
   """Triggers the requested task on CTFE and returns the new task's ID."""
   task = _CreateTaskJSON(options)
   m = hashlib.sha512()
   m.update(task)
   m.update('notverysecret' if options.local else _GetWebhookSaltFromMetadata())
   encoded = base64.standard_b64encode(m.digest())
 
@@ skipping 87 matching lines @@
       '', '--local', default=False, action='store_true',
       help='Uses a dummy metadata salt if this flag is true else it tries to '
            'get the salt from GCE metadata.')
   options, unused_args = option_parser.parse_args()
   if (not options.issue or not options.patchset or not options.requester
       or not options.benchmark):
     option_parser.error('Must specify issue, patchset, requester and benchmark')
 
   sys.exit(TriggerAndWait(options))