Revert 150863 - Browser Plugin: New Implementation (Renderer Side)

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc	(revision 150871)
+++ content/renderer/render_view_impl.cc	(working copy)
@@ -55,8 +55,6 @@
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
-#include "content/renderer/browser_plugin/browser_plugin.h"
-#include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/browser_plugin/old/old_browser_plugin.h"
 #include "content/renderer/browser_plugin/old/browser_plugin_channel_manager.h"
 #include "content/renderer/browser_plugin/old/browser_plugin_constants.h"
@@ -2319,13 +2317,6 @@
     return plugin;
   }
 
-  // TODO(fsamuel): Remove this once upstreaming of the new browser plugin is
-  // complete.
-  if (UTF16ToASCII(params.mimeType) == content::kBrowserPluginNewMimeType) {
-   return content::BrowserPluginManager::Get()->
-      CreateBrowserPlugin(this, frame, params);
-  }
-
   if (UTF16ToASCII(params.mimeType) == content::kBrowserPluginMimeType)
     return content::old::BrowserPlugin::Create(this, frame, params);
 
Property changes on: content/renderer/render_view_impl.cc
___________________________________________________________________
Deleted: svn:mergeinfo