Merge 115468 - Missing plugin : Fix null mimetype issue in embed tag

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc	(revision 115676)
+++ chrome/renderer/chrome_content_renderer_client.cc	(working copy)
@@ -358,6 +358,14 @@
       break;
     }
   }
+  
+  if (params.mimeType.isNull() && (actual_mime_type.size() > 0)) {
+    // Webkit might say that mime type is null while we already know the
+    // actual mime type via ChromeViewHostMsg_GetPluginInfo. In that case
+    // we should use what we know since WebpluginDelegateProxy does some
+    // specific initializations based on this information.
+    params.mimeType = WebString::fromUTF8(actual_mime_type.c_str());
+  }
 
   ContentSetting outdated_policy = CONTENT_SETTING_ASK;
   ContentSetting authorize_policy = CONTENT_SETTING_ASK;