Reverting the fixes for the UI test single-process mode in the NPAPI

tests. The offending Stream test has been disabled in single-process mode

TBR=jam

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

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

2 files changed, 1 insertions, 19 deletions

diff --git a/webkit/glue/plugins/plugin_stream.cc b/webkit/glue/plugins/plugin_stream.cc
index 33a40b8..9cdeb3b 100644
--- a/webkit/glue/plugins/plugin_stream.cc
+++ b/webkit/glue/plugins/plugin_stream.cc
@@ -29,17 +29,13 @@ PluginStream::PluginStream(
       requested_plugin_mode_(NP_NORMAL),
       temp_file_handle_(INVALID_HANDLE_VALUE),
       seekable_stream_(false),
-      data_offset_(0),
-      object_deleted_(NULL) {
+      data_offset_(0) {
   memset(&stream_, 0, sizeof(stream_));
   stream_.url = _strdup(url);
   temp_file_name_[0] = '\0';
 }
 
 PluginStream::~PluginStream() {
-  if (object_deleted_) {
-    *object_deleted_ = true;
-  }
   // always cleanup our temporary files.
   CleanupTempFile();
   free(const_cast<char*>(stream_.url));
@@ -82,9 +78,6 @@ bool PluginStream::Open(const std::string &mime_type,
       char_mime_type = temp_mime_type.c_str();
   }
 
-  bool object_deleted = false;
-  object_deleted_ = &object_deleted;
-
   // Silverlight expects a valid mime type
   DCHECK(strlen(char_mime_type) != 0);
   NPError err = instance_->NPP_NewStream((NPMIMEType)char_mime_type,
@@ -93,11 +86,6 @@ bool PluginStream::Open(const std::string &mime_type,
   if (err != NPERR_NO_ERROR)
     return false;
 
-  if (object_deleted) {
-    return true;
-  }
-
-  object_deleted_ = NULL;
   opened_ = true;
 
   if (requested_plugin_mode_ == NP_SEEK) {
diff --git a/webkit/glue/plugins/plugin_stream.h b/webkit/glue/plugins/plugin_stream.h
index c5c8226..be9a594 100644
--- a/webkit/glue/plugins/plugin_stream.h
+++ b/webkit/glue/plugins/plugin_stream.h
@@ -120,12 +120,6 @@ class PluginStream : public base::RefCounted<PluginStream> {
   bool                          seekable_stream_;
   std::string                   mime_type_;
   DISALLOW_EVIL_CONSTRUCTORS(PluginStream);
-  // This pointer can be used to track if the stream object
-  // got deleted while we call out to the plugin. To use
-  // this set this pointer to point to a variable for the duration
-  // of the call. If this pointer is valid we set the underlying
-  // variable to true in the destructor of the stream object.
-  bool*                         object_deleted_;
 };
 
 } // namespace NPAPI