[telemetry] Use consistent bucket naming.

tools/perf/page_sets/PRESUBMIT.py

 # Copyright 2013 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.
 
 import os
 import re
 import sys
 
 
 def LoadSupport(input_api):
@@ skipping 64 matching lines @@
     if not os.path.exists(file_path):
       results.append(output_api.PresubmitError(
           'Hash file exists, but file not found: %s' % hash_path))
       continue
     if cloud_storage.CalculateHash(file_path) != file_hash:
       results.append(output_api.PresubmitError(
           'Hash file does not match file\'s actual hash: %s' % hash_path))
       continue
 
     try:
-      bucket_input = raw_input('Uploading to Cloud Storage: %s\n'
-                               'Is this file [P]ublic or Google-[i]nternal?'
-                               % file_path).lower()
-      if 'public'.startswith(bucket_input):
-        bucket = cloud_storage.PUBLIC_BUCKET
-      elif ('internal'.startswith(bucket_input) or
-            'google-internal'.startswith(bucket_input)):
-        bucket = cloud_storage.INTERNAL_BUCKET
-      else:
+      bucket_aliases_string = ', '.join(cloud_storage.BUCKET_ALIASES)
+      bucket_input = raw_input(
+          'Uploading to Cloud Storage: %s\n'
+          'Which bucket should this go in? (%s) '
+          % (file_path, bucket_aliases_string)).lower()
+      bucket = cloud_storage.BUCKET_ALIASES.get(bucket_input, None)
+      if not bucket:
         results.append(output_api.PresubmitError(
-            'Response was neither "public" nor "internal": %s' % bucket_input))
+            '"%s" was not one of %s' % (bucket_input, bucket_aliases_string)))
         return results
 
       cloud_storage.Insert(bucket, file_hash, file_path)
       results.append(output_api.PresubmitNotifyResult(
           'Uploaded file to Cloud Storage: %s' % file_path))
     except cloud_storage.CloudStorageError, e:
       results.append(output_api.PresubmitError(
           'Unable to upload to Cloud Storage: %s\n\n%s' % (file_path, e)))
 
   return results
@@ skipping 22 matching lines @@
   return input_api.AffectedFiles(file_filter=_IsNewJsonPageSet)
 
 def CheckChangeOnUpload(input_api, output_api):
   results = _SyncFilesToCloud(input_api, output_api)
   return results
 
 
 def CheckChangeOnCommit(input_api, output_api):
   results = _VerifyFilesInCloud(input_api, output_api)
   return results