Revert 157773 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.ap…

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 298 matching lines @@
 bool ChromeContentRendererClient::OverrideCreatePlugin(
     content::RenderView* render_view,
     WebFrame* frame,
     const WebPluginParams& params,
     WebPlugin** plugin) {
   ChromeViewHostMsg_GetPluginInfo_Status status;
   webkit::WebPluginInfo plugin_info;
   std::string actual_mime_type;
   std::string orig_mime_type = params.mimeType.utf8();
 
-  if (orig_mime_type == content::kBrowserPluginNewMimeType ||
-      ((orig_mime_type == content::kBrowserPluginMimeType) &&
-        extensions::ExtensionHelper::Get(render_view)->view_type() ==
-        VIEW_TYPE_APP_SHELL)) {
+  if (orig_mime_type == content::kBrowserPluginMimeType &&
+      extensions::ExtensionHelper::Get(render_view)->view_type() ==
+          VIEW_TYPE_APP_SHELL)
       return false;
-  }
 
   render_view->Send(new ChromeViewHostMsg_GetPluginInfo(
       render_view->GetRoutingID(), GURL(params.url),
       frame->top()->document().url(), orig_mime_type,
       &status, &plugin_info, &actual_mime_type));
   *plugin = CreatePlugin(render_view, frame, params,
                          status, plugin_info, actual_mime_type);
   return true;
 }
 
@@ skipping 630 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome