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

chrome/plugin/chrome_plugin_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/plugin/chrome_plugin_host.h"
 
+#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/plugin_process.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "net/base/data_url.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
@@ skipping 305 matching lines @@
 int STDCALL CPB_GetBrowsingContextInfo(
     CPID id, CPBrowsingContext context, CPBrowsingContextInfoType type,
     void* buf, uint32 buf_size) {
   CHECK(ChromePluginLib::IsPluginThread());
 
   switch (type) {
   case CPBROWSINGCONTEXT_DATA_DIR_PTR: {
     if (buf_size < sizeof(char*))
       return sizeof(char*);
 
-    std::wstring wretval;
-    PluginThread::GetPluginThread()->Send(
-        new PluginProcessHostMsg_GetPluginDataDir(&wretval));
+    std::wstring wretval = CommandLine::ForCurrentProcess()->
+        GetSwitchValue(switches::kPluginDataDir);
+    DCHECK(!wretval.empty());
     file_util::AppendToPath(&wretval, chrome::kChromePluginDataDirname);
     *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, WideToUTF8(wretval));
     return CPERR_SUCCESS;
     }
   case CPBROWSINGCONTEXT_UI_LOCALE_PTR: {
     if (buf_size < sizeof(char*))
       return sizeof(char*);
 
     std::wstring wretval = webkit_glue::GetWebKitLocale();
     *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, WideToUTF8(wretval));
@@ skipping 254 matching lines @@
     response_funcs.size = sizeof(response_funcs);
     response_funcs.received_redirect = CPRR_ReceivedRedirect;
     response_funcs.start_completed = CPRR_StartCompleted;
     response_funcs.read_completed = CPRR_ReadCompleted;
     response_funcs.upload_progress = CPRR_UploadProgress;
   }
 
   return &browser_funcs;
 }