Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: tools/chrome_remote_control/chrome_remote_control/page_runner.py

Issue 10914237: Port perf.py's _LoginToGoogleAccount to chrome_remote_control (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/chrome_remote_control/chrome_remote_control/page_runner.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_runner.py b/tools/chrome_remote_control/chrome_remote_control/page_runner.py
index f5fe9999678fd38c24f89b6c4813f71715a4e93f..a5112a1892b2e1bbb9375558808ee04c99fcd06d 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_runner.py
+++ b/tools/chrome_remote_control/chrome_remote_control/page_runner.py
@@ -41,6 +41,7 @@ class PageRunner(object):
\n""" + 80 * '*' + '\n')
with possible_browser.Create(extra_browser_args) as b:
+ b.credentials.SetCredentialsConfigFile(self.page_set.credentials_path)
with b.CreateReplayServer(archive_path, options.record):
with b.ConnectToNthTab(0) as tab:
for page in self.page_set:
@@ -56,7 +57,7 @@ class PageRunner(object):
page.url, traceback.format_exc())
raise
finally:
- self.CleanUpPage()
+ self.CleanUpPage(page, tab)
try:
test.Run(options, page, tab, results)
@@ -73,7 +74,7 @@ class PageRunner(object):
page.url, traceback.format_exc())
raise
finally:
- self.CleanUpPage()
+ self.CleanUpPage(page, tab)
def Close(self):
if self._server:
@@ -93,6 +94,9 @@ class PageRunner(object):
self._server = tab.browser.CreateTemporaryHTTPServer(dirname)
page.url = self._server.UrlOf(filename)
+ if page.credentials:
+ tab.LoginNeeded(page.credentials)
+
tab.page.Navigate(page.url)
# TODO(dtu): Detect HTTP redirects.
if page.wait_time_after_navigate:
@@ -100,5 +104,6 @@ class PageRunner(object):
time.sleep(page.wait_time_after_navigate)
tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
- def CleanUpPage(self):
- pass
+ def CleanUpPage(self, page, tab): # pylint: disable=R0201
+ if page.credentials:
+ tab.LoginNoLongerNeeded(page.credentials)

Powered by Google App Engine
This is Rietveld 408576698