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)); |