Revert 202364 "Track NPObject ownership by the originating plugi..."

Suspected to have broken ClickToPlayPluginTest.NoCallbackAtLoad

> Track NPObject ownership by the originating plugins' NPP identifier. [2/3] (Chrome)
> 
> This CL updates Chrome to return plugin NPP identifiers for NPAPI, PPAPI and browser plugins, and to make the necessary calls into Blink to support object ownership tracking.
> 
> This CL requires Blink CL crrev.com/14989014, and is itself required by Blink CL crrev.com/14019005.
> 
> BUG=152006
> 
> Review URL: https://chromiumcodereview.appspot.com/15007012

TBR=wez@chromium.org

Review URL: https://codereview.chromium.org/15757007

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

1 files changed, 0 insertions, 14 deletions

diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index a7c0c71..d2756cb 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -1138,10 +1138,6 @@ bool BrowserPlugin::initialize(WebPluginContainer* container) {
   if (!GetContentClient()->renderer()->AllowBrowserPlugin(container))
     return false;
 
-  // Tell |container| to allow this plugin to use script objects.
-  npp_.reset(new NPP_t);
-  container->allowScriptObjects();
-
   bindings_.reset(new BrowserPluginBindings(this));
   container_ = container;
   container_->setWantsWheelEvents(true);
@@ -1185,12 +1181,6 @@ void BrowserPlugin::EnableCompositing(bool enable) {
 }
 
 void BrowserPlugin::destroy() {
-  // If the plugin was initialized then it has a valid |npp_| identifier, and
-  // the |container_| must clear references to the plugin's script objects.
-  DCHECK(!npp_ || container_);
-  if (container_)
-    container_->clearScriptObjects();
-
   // The BrowserPlugin's WebPluginContainer is deleted immediately after this
   // call returns, so let's not keep a reference to it around.
   g_plugin_container_map.Get().erase(container_);
@@ -1213,10 +1203,6 @@ NPObject* BrowserPlugin::scriptableObject() {
   return browser_plugin_np_object;
 }
 
-NPP BrowserPlugin::pluginNPP() {
-  return npp_.get();
-}
-
 bool BrowserPlugin::supportsKeyboardFocus() const {
   return true;
 }