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

Unified Diff: chrome/test/webdriver/commands/webdriver_command.cc

Issue 7108037: Revert 88492 - In chromedriver, add /log url to get the contents of the chromedriver log (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « chrome/test/webdriver/commands/create_session.cc ('k') | chrome/test/webdriver/dispatch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/webdriver/commands/webdriver_command.cc
===================================================================
--- chrome/test/webdriver/commands/webdriver_command.cc (revision 88495)
+++ chrome/test/webdriver/commands/webdriver_command.cc (working copy)
@@ -34,6 +34,7 @@
return false;
}
+ VLOG(1) << "Fetching session: " << session_id;
session_ = SessionManager::GetInstance()->GetSession(session_id);
if (session_ == NULL) {
response->SetError(
@@ -41,17 +42,15 @@
return false;
}
- LOG(INFO) << "Waiting for the page to stop loading";
- Error* error = session_->WaitForAllTabsToStopLoading();
- if (error) {
- response->SetError(error);
- return false;
+ // TODO(kkania): Do not use the standard automation timeout for this,
+ // and throw an error if it does not succeed.
+ scoped_ptr<Error> error(session_->WaitForAllTabsToStopLoading());
+ if (error.get()) {
+ LOG(WARNING) << error->ToString();
}
- LOG(INFO) << "Done waiting for the page to stop loading";
- error = session_->SwitchToTopFrameIfCurrentFrameInvalid();
- if (error) {
- response->SetError(error);
- return false;
+ error.reset(session_->SwitchToTopFrameIfCurrentFrameInvalid());
+ if (error.get()) {
+ LOG(WARNING) << error->ToString();
}
response->SetField("sessionId", Value::CreateStringValue(session_id));
« no previous file with comments | « chrome/test/webdriver/commands/create_session.cc ('k') | chrome/test/webdriver/dispatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698