Index: tools/telemetry/telemetry/util/cloud_storage.py |
diff --git a/tools/telemetry/telemetry/util/cloud_storage.py b/tools/telemetry/telemetry/util/cloud_storage.py |
index 0230b9acd98f9681ff2c812a4b7e5723d5d0f8ef..274c1dab9f05513591b22ccecd686130d5f8ff7b 100644 |
--- a/tools/telemetry/telemetry/util/cloud_storage.py |
+++ b/tools/telemetry/telemetry/util/cloud_storage.py |
@@ -14,7 +14,7 @@ import sys |
import tarfile |
import urllib2 |
-from telemetry.core.backends.chrome import cros_interface |
+from telemetry.core import platform |
from telemetry.util import path |
PUBLIC_BUCKET = 'chromium-telemetry' |
@@ -34,7 +34,7 @@ class CloudStorageError(Exception): |
if SupportsProdaccess(gsutil_path) and _FindExecutableInPath('prodaccess'): |
return 'Run prodaccess to authenticate.' |
else: |
- if cros_interface.IsRunningOnCrosDevice(): |
+ if platform.GetHostPlatform().GetOSName() == 'chromeos': |
gsutil_path = ('HOME=%s %s' % (_CROS_GSUTIL_HOME_WAR, gsutil_path)) |
return ('To configure your credentials:\n' |
' 1. Run "%s config" and follow its instructions.\n' |
@@ -113,7 +113,7 @@ def _RunCommand(args): |
# TODO(tbarzic): Figure out a better way to handle gsutil on cros. |
# http://crbug.com/386416, http://crbug.com/359293. |
gsutil_env = None |
- if cros_interface.IsRunningOnCrosDevice(): |
+ if platform.GetHostPlatform().GetOSName() == 'chromeos': |
gsutil_env = os.environ.copy() |
gsutil_env['HOME'] = _CROS_GSUTIL_HOME_WAR |