Handle automation server crashes.

chrome_frame/test/chrome_frame_automation_mock.h

 // Copyright (c) 2006-2009 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_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 14 matching lines @@
       const std::wstring& extra_chrome_arguments, bool incognito,
       bool is_widget_mode)
       : caller_message_loop_(caller_message_loop), is_connected_(false),
         navigation_result_(false) {
     test_server_.SetUp();
 
     FilePath profile_path(
         chrome_frame_test::GetProfilePath(profile_name));
 
     automation_client_ = new ChromeFrameAutomationClient;
-    ChromeFrameLaunchParams clp = {
-      launch_timeout,
-      GURL(),
-      GURL(),
-      profile_path,
-      profile_name,
-      extra_chrome_arguments,
-      perform_version_check,
-      incognito,
-      is_widget_mode
-    };
+    GURL empty;
+    scoped_refptr<ChromeFrameLaunchParams> clp(
+        new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name,
+            extra_chrome_arguments, incognito, is_widget_mode));
+    clp->set_launch_timeout(launch_timeout);
+    clp->set_version_check(perform_version_check);
     automation_client_->Initialize(this, clp);
   }
   ~AutomationMockDelegate() {
     if (automation_client_.get()) {
       automation_client_->Uninitialize();
       automation_client_ = NULL;
     }
     if (IsWindow())
       DestroyWindow();
 
@@ skipping 169 matching lines @@
   virtual void OnLoad(int tab_handle, const GURL& url) {
     Base::OnLoad(tab_handle, url);
   }
  private:
   bool request_start_result_;
 };
 
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_