Telemetry: Chrome object should support passing gaia_id.

BUG=chromium:535369
TEST=manual
Change-Id: Ife93f76e9f3fde87cebee9f3aa768a0768fdf587
Reviewed-on: https://chromium-review.googlesource.com/303747
Commit-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index e6315c6..8bf6c55 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -26,7 +26,7 @@
                  clear_enterprise_policy=True, dont_override_profile=False,
                  disable_gaia_services=True, disable_default_apps = True,
                  auto_login=True, gaia_login=False,
-                 username=None, password=None):
+                 username=None, password=None, gaia_id=None):
         """
         Constructor of telemetry wrapper.
 
@@ -51,7 +51,8 @@
                            Useful if you need to examine oobe.
         @param gaia_login: Logs in to real gaia.
         @param username: Log in using this username instead of the default.
-        @param username: Log in using this password instead of the default.
+        @param password: Log in using this password instead of the default.
+        @param gaia_id: Log in using this gaia_id instead of the default.
         """
         self._autotest_ext_path = None
         if autotest_ext:
@@ -96,6 +97,12 @@
         self.password = b_options.password if password is None else password
         b_options.username = self.username
         b_options.password = self.password
+        # gaia_id will be added to telemetry code in chromium repository later
+        try:
+            self.gaia_id = b_options.gaia_id if gaia_id is None else gaia_id
+            b_options.gaia_id = self.gaia_id
+        except AttributeError:
+            pass
 
         # Turn on collection of Chrome coredumps via creation of a magic file.
         # (Without this, Chrome coredumps are trashed.)