Revert r108760 / reland r108744, r108753 w/ fix

chrome/plugin/chrome_content_plugin_client.cc

Index: chrome/plugin/chrome_content_plugin_client.cc
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc
index b26f523f5c5280aedf1993b1851b6f016c40c825..0a8e42b99344e0d2ebb97c62860b6080b37ebbde 100644
--- a/chrome/plugin/chrome_content_plugin_client.cc
+++ b/chrome/plugin/chrome_content_plugin_client.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/plugin/chrome_content_plugin_client.h"
 
-#include "chrome/common/default_plugin.h"
-
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ -29,8 +27,6 @@ void ChromeContentPluginClient::PluginProcessStarted(
                                cf_plugin_name.get(), app_name.get()));
   base::mac::SetProcessName(process_name);
 #endif
-
-  chrome::RegisterInternalDefaultPlugin();
 }
 
 }  // namespace chrome