Index: webkit/plugins/npapi/plugin_instance.cc |
diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/plugins/npapi/plugin_instance.cc |
index bcda084f045b485e70564999cdfbc2078f4c9513..e24ff3549c73bae46bd20e372e4008e023be709b 100644 |
--- a/webkit/plugins/npapi/plugin_instance.cc |
+++ b/webkit/plugins/npapi/plugin_instance.cc |
@@ -77,7 +77,7 @@ PluginInstance::~PluginInstance() { |
npp_ = 0; |
} |
- if (plugin_) |
+ if (plugin_.get()) |
plugin_->CloseInstance(); |
} |
@@ -107,7 +107,7 @@ void PluginInstance::RemoveStream(PluginStream* stream) { |
std::vector<scoped_refptr<PluginStream> >::iterator stream_index; |
for (stream_index = open_streams_.begin(); |
stream_index != open_streams_.end(); ++stream_index) { |
- if (*stream_index == stream) { |
+ if (stream_index->get() == stream) { |
open_streams_.erase(stream_index); |
break; |
} |
@@ -534,7 +534,7 @@ void PluginInstance::RequestRead(NPStream* stream, NPByteRange* range_list) { |
range_info.push_back(','); |
} |
- if (plugin_data_stream_) { |
+ if (plugin_data_stream_.get()) { |
if (plugin_data_stream_->stream() == stream) { |
webplugin_->CancelDocumentLoad(); |
plugin_data_stream_ = NULL; |
@@ -550,7 +550,7 @@ void PluginInstance::RequestRead(NPStream* stream, NPByteRange* range_list) { |
std::vector<scoped_refptr<PluginStream> >::iterator stream_index; |
for (stream_index = open_streams_.begin(); |
stream_index != open_streams_.end(); ++stream_index) { |
- PluginStream* plugin_stream = *stream_index; |
+ PluginStream* plugin_stream = stream_index->get(); |
if (plugin_stream->stream() == stream) { |
// A stream becomes seekable the first time NPN_RequestRead |
// is called on it. |
@@ -671,7 +671,7 @@ void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) { |
std::vector<scoped_refptr<PluginStream> >::iterator stream_index; |
for (stream_index = open_streams_.begin(); |
stream_index != open_streams_.end(); ++stream_index) { |
- PluginStream* plugin_stream = *stream_index; |
+ PluginStream* plugin_stream = stream_index->get(); |
if (plugin_stream->notify_data() == notify_data) { |
WebPluginResourceClient* resource_client = |
plugin_stream->AsResourceClient(); |