Fix a timing issue that caused gears to fail to load sometimes....

chrome/browser/plugin_process_host.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/plugin_process_host.h"
 
 #include <windows.h>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 493 matching lines @@
     new_cmd_line.AppendArguments(cmd_line, true);
     cmd_line = new_cmd_line;
   }
 
   if (!locale.empty()) {
     // Pass on the locale so the null plugin will use the right language in the
     // prompt to install the desired plugin.
     cmd_line.AppendSwitchWithValue(switches::kLang, locale);
   }
 
+  // Gears requires the data dir to be available on startup.
+  std::wstring data_dir = plugin_service_->GetChromePluginDataDir();;
+  DCHECK(!data_dir.empty());
+  cmd_line.AppendSwitchWithValue(switches::kPluginDataDir, data_dir);
+
   cmd_line.AppendSwitchWithValue(switches::kProcessType,
                                  switches::kPluginProcess);
 
   cmd_line.AppendSwitchWithValue(switches::kProcessChannelID,
                                  channel_id_);
 
   cmd_line.AppendSwitchWithValue(switches::kPluginPath,
                                  plugin_path.ToWStringHack());
 
   bool in_sandbox = !browser_command_line.HasSwitch(switches::kNoSandbox) &&
@@ skipping 119 matching lines @@
 #endif
 
   IPC_BEGIN_MESSAGE_MAP(PluginProcessHost, msg)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_ChannelCreated, OnChannelCreated)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_DownloadUrl, OnDownloadUrl)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_GetPluginFinderUrl,
                         OnGetPluginFinderUrl)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_ShutdownRequest,
                         OnPluginShutdownRequest)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_PluginMessage, OnPluginMessage)
-    IPC_MESSAGE_HANDLER(PluginProcessHostMsg_GetPluginDataDir,
-                        OnGetPluginDataDir)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RequestResource, OnRequestResource)
     IPC_MESSAGE_HANDLER(ViewHostMsg_CancelRequest, OnCancelRequest)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DataReceived_ACK, OnDataReceivedACK)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UploadProgress_ACK, OnUploadProgressACK)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_SyncLoad, OnSyncLoad)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_GetCookies, OnGetCookies)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginProcessHostMsg_ResolveProxy,
                                     OnResolveProxy)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginProcessHostMsg_CreateWindow,
                                     OnCreateWindow)
@@ skipping 246 matching lines @@
          ChromeThread::GetMessageLoop(ChromeThread::IO));
 
   ChromePluginLib *chrome_plugin = ChromePluginLib::Find(plugin_path_);
   if (chrome_plugin) {
     void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
     uint32 data_len = static_cast<uint32>(data.size());
     chrome_plugin->functions().on_message(data_ptr, data_len);
   }
 }
 
-void PluginProcessHost::OnGetPluginDataDir(std::wstring* retval) {
-  *retval = plugin_service_->GetChromePluginDataDir();
-}
-
 void PluginProcessHost::OnCreateWindow(HWND parent, IPC::Message* reply_msg) {
   // Need to create this window on the UI thread.
   plugin_service_->main_message_loop()->PostTask(FROM_HERE,
       new CreateWindowTask(plugin_path_, parent, reply_msg));
 }
 
 void PluginProcessHost::OnDestroyWindow(HWND window) {
   plugin_service_->main_message_loop()->PostTask(FROM_HERE,
       new DestroyWindowTask(window));
 }
 
 void PluginProcessHost::Shutdown() {
 
   Send(new PluginProcessMsg_BrowserShutdown);
 }