Move username password to CrosBrowserOptions.

BUG=277033
TEST=manual
NOTRY=True

Review URL: https://codereview.chromium.org/99043005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242194 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 8 deletions

diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py
index 7868519..90ab3d1 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_options.py
@@ -37,3 +37,5 @@ class CrosBrowserOptions(ChromeBrowserOptions):
     # Create a browser with oobe property.
     self.create_browser_with_oobe = False
     self.auto_login = True
+    self.username = 'test@test.test'
+    self.password = ''
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
index 14e52c9..b84833c 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
@@ -41,16 +41,14 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
 
     self._SetBranchNumber(self._GetChromeVersion())
 
-    self._username = 'test@test.test'
-    self._password = ''
-
     self._login_ext_dir = None
     if not self._use_oobe_login_for_testing:
       self._login_ext_dir = os.path.join(os.path.dirname(__file__),
                                          'chromeos_login_ext')
 
       # Push a dummy login extension to the device.
-      # This extension automatically logs in test user self._username.
+      # This extension automatically logs in test user specified by
+      # self.browser_options.username.
       # Note that we also perform this copy locally to ensure that
       # the owner of the extensions is set to chronos.
       logging.info('Copying dummy login extension to the device')
@@ -75,7 +73,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
     # Delete test user's cryptohome vault (user data directory).
     if not self.browser_options.dont_override_profile:
       self._cri.RunCmdOnDevice(['cryptohome', '--action=remove', '--force',
-                                '--user=%s' % self._username])
+                                '--user=%s' % self.browser_options.username])
     if self.browser_options.profile_dir:
       cri.RmRF(self.profile_directory)
       cri.PushFile(self.browser_options.profile_dir + '/Default',
@@ -317,7 +315,7 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
 
   def _IsCryptohomeMounted(self):
     """Returns True if a cryptohome vault at the user mount point."""
-    profile_path = self._CryptohomePath(self._username)
+    profile_path = self._CryptohomePath(self.browser_options.username)
     mount = self._cri.FilesystemMountedAt(profile_path)
     return mount and mount.startswith('/home/.shadow/')
 
@@ -405,8 +403,8 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
         raise exceptions.LoginException('Oobe.loginForTesting js api missing')
 
       self.oobe.ExecuteJavaScript(
-          'Oobe.loginForTesting(\'%s\', \'%s\');' % (self._username,
-                                                     self._password))
+          'Oobe.loginForTesting(\'%s\', \'%s\');'
+              % (self.browser_options.username, self.browser_options.password))
 
     try:
       util.WaitFor(self._IsLoggedIn, 60)