Handle automation server crashes.

chrome_frame/chrome_frame_plugin.h

 // Copyright (c) 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_CHROME_FRAME_PLUGIN_H_
 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
 
+#include <string>
+#include <vector>
+
 #include "base/ref_counted.h"
 #include "base/win_util.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/simple_resource_loader.h"
 #include "chrome_frame/utils.h"
 
 #include "grit/chromium_strings.h"
 
@@ skipping 36 matching lines @@
       automation_client_->Uninitialize();
       automation_client_ = NULL;
     }
   }
 
   bool InitializeAutomation(const std::wstring& profile_name,
                             const std::wstring& extra_chrome_arguments,
                             bool incognito, bool is_widget_mode,
                             const GURL& url, const GURL& referrer) {
     DCHECK(IsValid());
+    DCHECK(launch_params_ == NULL);
     // We don't want to do incognito when privileged, since we're
     // running in browser chrome or some other privileged context.
     bool incognito_mode = !is_privileged_ && incognito;
     FilePath profile_path;
     GetProfilePath(profile_name, &profile_path);
-    ChromeFrameLaunchParams chrome_launch_params = {
-      kCommandExecutionTimeout,
-      url,
-      referrer,
-      profile_path,
-      profile_name,
-      extra_chrome_arguments,
-      true,
-      incognito_mode,
-      is_widget_mode
-    };
-    return automation_client_->Initialize(this, chrome_launch_params);
+    launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path,
+        profile_name, extra_chrome_arguments, incognito_mode, is_widget_mode);
+    return automation_client_->Initialize(this, launch_params_);
   }
 
   // ChromeFrameDelegate implementation
   virtual WindowType GetWindow() const {
     return (static_cast<const T*>(this))->m_hWnd;
   }
 
   virtual void GetBounds(RECT* bounds) {
     if (bounds) {
       if (::IsWindow(GetWindow())) {
@@ skipping 142 matching lines @@
                               FilePath* profile_path) {
     chrome::GetChromeFrameUserDataDirectory(profile_path);
     *profile_path = profile_path->Append(profile_name);
     DLOG(INFO) << __FUNCTION__ << ": " << profile_path->value();
   }
 
  protected:
   // Our gateway to chrome land
   scoped_refptr<ChromeFrameAutomationClient> automation_client_;
 
+  // How we launched Chrome.
+  scoped_refptr<ChromeFrameLaunchParams> launch_params_;
+
   // Url of the containing document.
   std::string document_url_;
 
   // We set this flag when we're taking the focus ourselves
   // and notifying the host browser that we're doing so.
   // When the flag is not set, we transfer the focus to chrome.
   bool ignore_setfocus_;
 
   // The plugin is privileged if it is:
   // * Invoked by a window running under the system principal in FireFox.
   // * Being hosted by a custom host exposing the SID_ChromeFramePrivileged
   //   service.
   //
   // When privileged, additional interfaces are made available to the user.
   bool is_privileged_;
 
   // List of functions to enable for automation, or a single entry "*" to
   // enable all functions for automation.  Ignored unless is_privileged_ is
   // true.  Defaults to the empty list, meaning automation will not be
   // turned on.
   std::vector<std::string> functions_enabled_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_