| Index: tools/telemetry/telemetry/browser_credentials.py
|
| diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_credentials.py b/tools/telemetry/telemetry/browser_credentials.py
|
| similarity index 89%
|
| rename from tools/chrome_remote_control/chrome_remote_control/browser_credentials.py
|
| rename to tools/telemetry/telemetry/browser_credentials.py
|
| index 2e00e8c53dc2019f035900e610d335687a01a8a5..9908d9188166ddc91da9cf908820b95e23cebc76 100644
|
| --- a/tools/chrome_remote_control/chrome_remote_control/browser_credentials.py
|
| +++ b/tools/telemetry/telemetry/browser_credentials.py
|
| @@ -5,9 +5,9 @@ import logging
|
| import json
|
| import os
|
|
|
| -from chrome_remote_control import facebook_credentials_backend
|
| -from chrome_remote_control import google_credentials_backend
|
| -from chrome_remote_control import options_for_unittests
|
| +from telemetry import facebook_credentials_backend
|
| +from telemetry import google_credentials_backend
|
| +from telemetry import options_for_unittests
|
|
|
| class BrowserCredentials(object):
|
| def __init__(self, backends = None):
|
| @@ -71,13 +71,13 @@ class BrowserCredentials(object):
|
| credentials = json.loads(f.read())
|
|
|
| # TODO(nduca): use system keychain, if possible.
|
| - homedir_credentials_path = os.path.expanduser('~/.crc-credentials')
|
| + homedir_credentials_path = os.path.expanduser('~/.telemetry-credentials')
|
| homedir_credentials = {}
|
|
|
| if (not options_for_unittests.Get() and
|
| os.path.exists(homedir_credentials_path)):
|
| - logging.info("Found ~/.crc-credentials. Its contents will be used when "
|
| - "no other credentials can be found.")
|
| + logging.info("Found ~/.telemetry-credentials. Its contents will be used "
|
| + "when no other credentials can be found.")
|
| with open(homedir_credentials_path, 'r') as f:
|
| homedir_credentials = json.loads(f.read())
|
|
|
| @@ -90,7 +90,7 @@ class BrowserCredentials(object):
|
| if k in credentials:
|
| self._credentials[k] = credentials[k]
|
| if k in homedir_credentials:
|
| - logging.info("Will use ~/.crc-credentials for %s logins." % k)
|
| + logging.info("Will use ~/.telemetry-credentials for %s logins." % k)
|
| self._credentials[k] = homedir_credentials[k]
|
| if k in self._extra_credentials:
|
| self._credentials[k] = self._extra_credentials[k]
|
| @@ -110,7 +110,7 @@ class BrowserCredentials(object):
|
| files_to_tweak.append(
|
| os.path.relpath(os.path.join(page_set.base_dir,
|
| page_set.credentials_path)))
|
| - files_to_tweak.append('~/.crc-credentials')
|
| + files_to_tweak.append('~/.telemetry-credentials')
|
|
|
| example_credentials_file = (
|
| os.path.relpath(
|
|
|