Resubmit r3612 and r3613 this time with mac fixes (thanks mark!).

Review URL: http://codereview.chromium.org/7675

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3633 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 21 deletions

diff --git a/webkit/port/plugins/chromium/PluginDataChromium.cpp b/webkit/port/plugins/chromium/PluginDataChromium.cpp
index c289464..7670e22 100644
--- a/webkit/port/plugins/chromium/PluginDataChromium.cpp
+++ b/webkit/port/plugins/chromium/PluginDataChromium.cpp
@@ -5,6 +5,8 @@
 #include "config.h"
 #include "PluginData.h"
 
+#include "PluginInfoStore.h"
+
 #undef LOG
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webkit_glue.h"
@@ -20,28 +22,9 @@ void PluginData::initPlugins()
         return;
     refreshData = false;
 
+    PluginInfoStore c;
     for (size_t i = 0; i < plugins.size(); ++i) {
-        const WebPluginInfo& sourceInfo = plugins[i];
-
-        PluginInfo* info = new PluginInfo;
-        info->name = webkit_glue::StdWStringToString(sourceInfo.name);
-        info->file = webkit_glue::StdWStringToString(sourceInfo.file);
-        info->desc = webkit_glue::StdWStringToString(sourceInfo.desc);
-
-        for (size_t j = 0; j < sourceInfo.mime_types.size(); ++j) {
-            const WebPluginMimeType& mimeType = sourceInfo.mime_types[j];
-
-            MimeClassInfo* mime = new MimeClassInfo;
-            mime->type = webkit_glue::StdStringToString(mimeType.mime_type);
-            mime->desc = webkit_glue::StdWStringToString(mimeType.description);
-
-            for (size_t k = 0; k < mimeType.file_extensions.size(); ++k) {
-                if (k > 0)
-                    mime->suffixes += ",";
-                mime->suffixes += webkit_glue::StdStringToString(mimeType.file_extensions[k]);
-            }
-            info->mimes.append(mime);
-        }
+        PluginInfo* info = c.createPluginInfoForPluginAtIndex(i);
         m_plugins.append(info);
     }
 }