Revert 121875 - Whitelist PDF viewer and Google Talk plug-in for click-to-play.

I'd like consensus on this before we add this behavior, since I fear it will be more difficult to pull out if it becomes the status quo.

BUG=113960


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

TBR=bauerb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9365063

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

1 files changed, 0 insertions, 16 deletions

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 59cc477..66a7744 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -373,22 +373,6 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
       status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
     }
 
-    if (status_value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay) {
-      FilePath pdf_path;
-      bool success = PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path);
-      DCHECK(success);
-      if (plugin.path == pdf_path) {
-        status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
-      } else {
-        for (size_t i = 0; i < plugin.mime_types.size(); ++i) {
-          if (plugin.mime_types[i].mime_type == "application/googletalk") {
-            status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
-            break;
-          }
-        }
-      }
-    }
-
     switch (status_value) {
       case ChromeViewHostMsg_GetPluginInfo_Status::kNotFound: {
         NOTREACHED();