Bustage fix for bug 499431.

modules/plugin/base/src/nsPluginNativeWindowWin.cpp

@@ -60,8 +60,6 @@
 #include "nsAutoPtr.h"
 #include "nsTWeakRef.h"
 
-static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS_TRY_SAFE_CALL
-
 #define NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION TEXT("MozillaPluginWindowPropertyAssociation")
 #define NS_PLUGIN_CUSTOM_MSG_ID TEXT("MozFlashUserRelay")
 #define WM_USER_FLASH WM_USER+1

modules/plugin/base/src/nsPluginSafety.h

@@ -76,7 +76,7 @@ PR_BEGIN_MACRO                                     \
     catch(...)                                     \
     {                                              \
       nsresult res;                                \
-      nsCOMPtr<nsIPluginHost> host(do_GetService(kCPluginManagerCID, &res));\
+      nsCOMPtr<nsIPluginHost> host(do_GetService(MOZ_PLUGIN_HOST_CONTRACTID, &res));\
       if(NS_SUCCEEDED(res) && (host != nsnull))    \
         host->HandleBadPlugin(library, pluginInst);\
       ret = (NPError)NS_ERROR_FAILURE;             \
@@ -99,7 +99,7 @@ PR_BEGIN_MACRO                              \
     catch(...)                              \
     {                                       \
       nsresult res;                         \
-      nsCOMPtr<nsIPluginHost> host(do_GetService(kCPluginManagerCID, &res));\
+      nsCOMPtr<nsIPluginHost> host(do_GetService(MOZ_PLUGIN_HOST_CONTRACTID, &res));\
       if(NS_SUCCEEDED(res) && (host != nsnull))\
         host->HandleBadPlugin(library, pluginInst);\
     }                                       \