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

trunk/src/webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: trunk/src/webkit/plugins/ppapi/ppapi_plugin_instance.cc
===================================================================
--- trunk/src/webkit/plugins/ppapi/ppapi_plugin_instance.cc	(revision 202368)
+++ trunk/src/webkit/plugins/ppapi/ppapi_plugin_instance.cc	(working copy)
@@ -437,16 +437,17 @@
       selection_anchor_(0),
       pending_user_gesture_(0.0),
       document_loader_(NULL),
-      nacl_document_load_(false),
-      npp_(new NPP_t) {
+      nacl_document_load_(false) {
   pp_instance_ = HostGlobals::Get()->AddInstance(this);
 
   memset(&current_print_settings_, 0, sizeof(current_print_settings_));
   DCHECK(delegate);
   module_->InstanceCreated(this);
   delegate_->InstanceCreated(this);
+  message_channel_.reset(new MessageChannel(this));
 
   view_data_.is_page_visible = delegate->IsPageVisible();
+
   resource_creation_ = delegate_->CreateResourceCreationAPI(this);
 
   // TODO(bbudge) remove this when the trusted NaCl plugin has been removed.
@@ -633,8 +634,6 @@
 bool PluginInstance::Initialize(const std::vector<std::string>& arg_names,
                                 const std::vector<std::string>& arg_values,
                                 bool full_frame) {
-  message_channel_.reset(new MessageChannel(this));
-
   full_frame_ = full_frame;
 
   UpdateTouchEventRequest();
@@ -2546,10 +2545,6 @@
          module == original_module_.get();
 }
 
-NPP PluginInstance::instanceNPP() {
-  return npp_.get();
-}
-
 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) {
   cursor_.reset(cursor);
   if (fullscreen_container_) {