Bug 583506: Remove remaining support for blackwood java from plugins module. r/a=jst

modules/plugin/base/src/nsPluginHost.cpp

@@ -1024,7 +1024,6 @@ NS_IMETHODIMP nsPluginHost::InstantiateEmbeddedPlugin(const char *aMimeType,
   }
 
   if (FindStoppedPluginForURL(aURL, aOwner) == NS_OK) {
-
     PLUGIN_LOG(PLUGIN_LOG_NOISY,
     ("nsPluginHost::InstantiateEmbeddedPlugin FoundStopped mime=%s\n", aMimeType));
 
@@ -1034,12 +1033,6 @@ NS_IMETHODIMP nsPluginHost::InstantiateEmbeddedPlugin(const char *aMimeType,
     if (!isJava && bCanHandleInternally)
       rv = NewEmbeddedPluginStream(aURL, aOwner, instance);
 
-    // notify Java DOM component
-    nsresult res;
-    nsCOMPtr<nsIPluginInstanceOwner> javaDOM = do_GetService("@mozilla.org/blackwood/java-dom;1", &res);
-    if (NS_SUCCEEDED(res) && javaDOM)
-      javaDOM->SetInstance(instance);
-
     return NS_OK;
   }
 
@@ -1090,13 +1083,6 @@ NS_IMETHODIMP nsPluginHost::InstantiateEmbeddedPlugin(const char *aMimeType,
 
     if (havedata && !isJava && bCanHandleInternally)
       rv = NewEmbeddedPluginStream(aURL, aOwner, instance);
-
-    // notify Java DOM component
-    nsresult res;
-    nsCOMPtr<nsIPluginInstanceOwner> javaDOM =
-             do_GetService("@mozilla.org/blackwood/java-dom;1", &res);
-    if (NS_SUCCEEDED(res) && javaDOM)
-      javaDOM->SetInstance(instance);
   }
 
 #ifdef PLUGIN_LOGGING
@@ -1638,10 +1624,10 @@ nsPluginHost::FindPluginForType(const char* aMimeType,
 
   // if we have a mimetype passed in, search the mPlugins
   // linked list for a match
-  if (nsnull != aMimeType) {
+  if (aMimeType) {
     plugins = mPlugins;
 
-    while (nsnull != plugins) {
+    while (plugins) {
       variants = plugins->mVariants;
       for (cnt = 0; cnt < variants; cnt++) {
         if ((!aCheckEnabled || plugins->IsEnabled()) &&
@@ -1650,7 +1636,6 @@ nsPluginHost::FindPluginForType(const char* aMimeType,
           return plugins;
         }
       }
-
       plugins = plugins->mNext;
     }
   }