Handle automation server crashes.

chrome_frame/test/proxy_factory_mock.h

Index: chrome_frame/test/proxy_factory_mock.h
===================================================================
--- chrome_frame/test/proxy_factory_mock.h	(revision 55540)
+++ chrome_frame/test/proxy_factory_mock.h	(working copy)
@@ -1,8 +1,8 @@
 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#ifndef CHROME_FRAME_PROXY_FACTORY_MOCK_H_
-#define CHROME_FRAME_PROXY_FACTORY_MOCK_H_
+#ifndef CHROME_FRAME_TEST_PROXY_FACTORY_MOCK_H_
+#define CHROME_FRAME_TEST_PROXY_FACTORY_MOCK_H_
 
 #include <windows.h>
 #include <string>
@@ -10,16 +10,20 @@
 #include "gmock/gmock.h"
 #include "chrome_frame/chrome_frame_automation.h"
 
-struct LaunchDelegateMock : public ProxyFactory::LaunchDelegate {
+struct LaunchDelegateMock : public LaunchDelegate {
   MOCK_METHOD2(LaunchComplete, void(ChromeFrameAutomationProxy*,
-    AutomationLaunchResult));
+      AutomationLaunchResult));
+  MOCK_METHOD0(AutomationServerDied, void());
 };
 
 class MockProxyFactory : public ProxyFactory {
  public:
-  MOCK_METHOD3(GetAutomationServer, void (ProxyFactory::LaunchDelegate*,
-      const ChromeFrameLaunchParams& params, void** automation_server_id));
-  MOCK_METHOD1(ReleaseAutomationServer, bool(void* id));
+  MOCK_METHOD3(GetAutomationServer,
+      void (LaunchDelegate*,  // NOLINT
+            ChromeFrameLaunchParams* params,
+            void** automation_server_id));
+  MOCK_METHOD2(ReleaseAutomationServer, bool(void* server_id,
+                                             LaunchDelegate* delegate));
 
   MockProxyFactory() : thread_("mock factory worker") {
     thread_.Start();
@@ -31,7 +35,7 @@
                      void* proxy_id,
                      AutomationLaunchResult result,
                      LaunchDelegate* d,
-                     const ChromeFrameLaunchParams& params,
+                     ChromeFrameLaunchParams* params,
                      void** automation_server_id);
 
   base::Thread thread_;
@@ -39,5 +43,5 @@
 };
 
 
-#endif  // CHROME_FRAME_PROXY_FACTORY_MOCK_H_
+#endif  // CHROME_FRAME_TEST_PROXY_FACTORY_MOCK_H_