3 files changed, 11 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 989c91a..461b3e4 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -203,6 +203,10 @@ void AutomationProxy::SignalAppLaunch(const std::string& version_string) {
   app_launched_.Signal();
 }
 
+bool AutomationProxy::WaitForProcessLauncherThreadToGoIdle() {
+  return Send(new AutomationMsg_WaitForProcessLauncherThreadToGoIdle());
+}
+
 bool AutomationProxy::WaitForInitialLoads() {
   return initial_loads_complete_.TimedWait(command_execution_timeout_);
 }
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 323538c..cfc8c8b 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -87,6 +87,9 @@ class AutomationProxy : public IPC::Channel::Listener,
   // set_perform_version_check() to set it.
   AutomationLaunchResult WaitForAppLaunch();
 
+  // See description in AutomationMsg_WaitForProcessLauncherThreadToGoIdle.
+  bool WaitForProcessLauncherThreadToGoIdle() WARN_UNUSED_RESULT;
+
   // Waits for any initial page loads to complete.
   // NOTE: this only fires once for a run of the application.
   // Returns true if the load is successful
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index f7908c4..5625c40 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -563,7 +563,10 @@ void TabProxy::HandleMessageFromExternalHost(const std::string& message,
 bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) {
   if (!is_valid())
     return false;
-  return sender_->Send(new AutomationMsg_WaitForTabToBeRestored(handle_));
+  bool succeeded = false;
+  return sender_->Send(
+      new AutomationMsg_WaitForTabToBeRestored(handle_, &succeeded)) &&
+      succeeded;
 }
 
 bool TabProxy::GetSecurityState(SecurityStyle* security_style,