Fix some DCHECKS when using BrowserPlugin for extension mime type handlers

chrome/browser/extensions/plugin_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #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"
@@ skipping 64 matching lines @@
          module != nacl_modules->end();
          ++module) {
       RegisterNaClModule(*module);
     }
     UpdatePluginListWithNaClModules();
   }
 
   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
   if (handler && !handler->handler_url().empty()) {
     plugins_or_nacl_changed = true;
-    RegisterMimeTypeHandler(handler->extension_id());
-    UpdatePluginListWithNaClModules();
+
+    content::WebPluginInfo info;
+    info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN;
+    info.name = base::UTF8ToUTF16(handler->extension_id());
+    info.path = base::FilePath::FromUTF8Unsafe(handler->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);
   }
 
   if (plugins_or_nacl_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 }
 
 void PluginManager::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
@@ skipping 19 matching lines @@
          module != nacl_modules->end();
          ++module) {
       UnregisterNaClModule(*module);
     }
     UpdatePluginListWithNaClModules();
   }
 
   const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
   if (handler && !handler->handler_url().empty()) {
     plugins_or_nacl_changed = true;
-    UnregisterMimeTypeHandler(handler->extension_id());
+    base::FilePath path =
+        base::FilePath::FromUTF8Unsafe(handler->extension_id());
+    PluginService::GetInstance()->UnregisterInternalPlugin(path);
+    PluginService::GetInstance()->ForcePluginShutdown(path);
+    PluginService::GetInstance()->RefreshPlugins();
   }
 
   if (plugins_or_nacl_changed)
     PluginService::GetInstance()->PurgePluginListCache(profile_, false);
 }
 
 void PluginManager::RegisterNaClModule(const NaClModuleInfo& info) {
   DCHECK(FindNaClModule(info.url) == nacl_module_list_.end());
   nacl_module_list_.push_front(info);
 }
@@ skipping 43 matching lines @@
         info.mime_types.push_back(mime_type_info);
       }
 
       PluginService::GetInstance()->RefreshPlugins();
       PluginService::GetInstance()->RegisterInternalPlugin(info, true);
       // This plugin has been modified, no need to check the rest of its
       // types, but continue checking other plugins.
       break;
     }
   }
-
-  for (std::set<std::string>::iterator ix =
-       mime_type_handler_extension_ids_.begin();
-       ix != mime_type_handler_extension_ids_.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 && !handler->handler_url().empty()) {
-      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_extension_ids_.insert(extension_id);
-}
-
-void PluginManager::UnregisterMimeTypeHandler(const std::string& extension_id) {
-  mime_type_handler_extension_ids_.erase(extension_id);
-  PluginService::GetInstance()->UnregisterInternalPlugin(
-    base::FilePath::FromUTF8Unsafe(extension_id));
-}
-
 NaClModuleInfo::List::iterator PluginManager::FindNaClModule(const GURL& url) {
   for (NaClModuleInfo::List::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }
 
 }  // namespace extensions