2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index acdd77e..02790e5 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1307,6 +1307,7 @@ struct ParamTraits<WebPluginInfo> {
     WriteParam(m, p.version);
     WriteParam(m, p.desc);
     WriteParam(m, p.mime_types);
+    WriteParam(m, p.enabled);
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
     return
@@ -1314,7 +1315,8 @@ struct ParamTraits<WebPluginInfo> {
       ReadParam(m, iter, &r->path) &&
       ReadParam(m, iter, &r->version) &&
       ReadParam(m, iter, &r->desc) &&
-      ReadParam(m, iter, &r->mime_types);
+      ReadParam(m, iter, &r->mime_types) &&
+      ReadParam(m, iter, &r->enabled);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
@@ -1328,6 +1330,8 @@ struct ParamTraits<WebPluginInfo> {
     LogParam(p.desc, l);
     l->append(L", ");
     LogParam(p.mime_types, l);
+    l->append(L", ");
+    LogParam(p.enabled, l);
     l->append(L")");
   }
 };
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index b8ddb28..6fd0c49 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1242,14 +1242,15 @@ IPC_BEGIN_MESSAGES(ViewHost)
                               bool /* refresh*/,
                               std::vector<WebPluginInfo> /* plugins */)
 
-  // Returns a path to a plugin for the given url and mime type.  If there's
-  // no plugin, an empty string is returned.
-  IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_GetPluginPath,
+  // Return information about a plugin for the given URL and MIME type. If there
+  // is no matching plugin, |found| is set to false.
+  IPC_SYNC_MESSAGE_CONTROL3_3(ViewHostMsg_GetPluginInfo,
                               GURL /* url */,
                               GURL /* policy_url */,
                               std::string /* mime_type */,
-                              FilePath /* filename */,
-                              std::string /* actual mime type for url */)
+                              bool /* found */,
+                              WebPluginInfo /* plugin info */,
+                              std::string /* actual_mime_type */)
 
   // Requests spellcheck for a word.
   IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_SpellCheck,