Forward MIME types to BrowserPlugin when a viewer is specified.

chrome/browser/extensions/plugin_manager.cc

Index: chrome/browser/extensions/plugin_manager.cc
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index 526aa0c1121ee995fc6e1aad5d0925a0d0c8cd36..60633c0befa8f2e45a0de60a025f45f04b086c9d 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -6,11 +6,13 @@
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/plugin_manager.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
+#include "chrome/common/extensions/mime_types_handler.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "extensions/browser/extension_registry.h"
@@ -77,6 +79,13 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
     UpdatePluginListWithNaClModules();
   }
 
+  const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+  if (handler) {
+    plugins_or_nacl_changed = true;
+    RegisterMimeTypeHandler(handler->extension_id());
+    UpdatePluginListWithNaClModules();
+  }
+
   if (plugins_or_nacl_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 }
@@ -111,6 +120,12 @@ void PluginManager::OnExtensionUnloaded(
     UpdatePluginListWithNaClModules();
   }
 
+  const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+  if (handler) {
+    plugins_or_nacl_changed = true;
+    UnregisterMimeTypeHandler(handler->extension_id());
+  }
+
   if (plugins_or_nacl_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 }
@@ -172,6 +187,44 @@ void PluginManager::UpdatePluginListWithNaClModules() {
       break;
     }
   }
+
+  for (std::set<std::string>::iterator ix = mime_type_handler_.begin();
+       ix != mime_type_handler_.end(); ++ix) {
+    const std::string& extension_id = *ix;
+    const Extension* extension =
+        profile_->GetExtensionService()->GetExtensionById(extension_id, false);
+    const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
+    if (handler) {
+      PluginService::GetInstance()->UnregisterInternalPlugin(
+          base::FilePath::FromUTF8Unsafe(extension_id));
+
+      content::WebPluginInfo info;
+      info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
+      info.name = base::UTF8ToUTF16(extension_id);
+      info.path = base::FilePath::FromUTF8Unsafe(extension_id);
+
+      for (std::set<std::string>::const_iterator mime_type =
+               handler->mime_type_set().begin();
+           mime_type != handler->mime_type_set().end(); ++mime_type) {
+        content::WebPluginMimeType mime_type_info;
+        mime_type_info.mime_type = *mime_type;
+        info.mime_types.push_back(mime_type_info);
+      }
+
+      PluginService::GetInstance()->RefreshPlugins();
+      PluginService::GetInstance()->RegisterInternalPlugin(info, true);
+    }
+  }
+}
+
+void PluginManager::RegisterMimeTypeHandler(const std::string& extension_id) {
+  mime_type_handler_.insert(extension_id);
+}
+
+void PluginManager::UnregisterMimeTypeHandler(const std::string& extension_id) {
+  mime_type_handler_.erase(extension_id);
+  PluginService::GetInstance()->UnregisterInternalPlugin(
+    base::FilePath::FromUTF8Unsafe(extension_id));
 }
 
 NaClModuleInfo::List::iterator PluginManager::FindNaClModule(const GURL& url) {