Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

webkit/plugins/npapi/plugin_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/npapi/plugin_instance.h"
 
 #include "base/bind.h"
 #include "build/build_config.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 59 matching lines @@
 }
 
 PluginInstance::~PluginInstance() {
   CloseStreams();
 
   if (npp_ != 0) {
     delete npp_;
     npp_ = 0;
   }
 
-  if (plugin_)
+  if (plugin_.get())
     plugin_->CloseInstance();
 }
 
 PluginStreamUrl* PluginInstance::CreateStream(unsigned long resource_id,
                                               const GURL& url,
                                               const std::string& mime_type,
                                               int notify_id) {
 
   bool notify;
   void* notify_data;
   GetNotifyData(notify_id, &notify, &notify_data);
   PluginStreamUrl* stream = new PluginStreamUrl(
       resource_id, url, this, notify, notify_data);
 
   AddStream(stream);
   return stream;
 }
 
 void PluginInstance::AddStream(PluginStream* stream) {
   open_streams_.push_back(make_scoped_refptr(stream));
 }
 
 void PluginInstance::RemoveStream(PluginStream* stream) {
   if (in_close_streams_)
     return;
 
   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;
     }
   }
 }
 
 bool PluginInstance::IsValidStream(const NPStream* stream) {
   std::vector<scoped_refptr<PluginStream> >::iterator stream_index;
   for (stream_index = open_streams_.begin();
           stream_index != open_streams_.end(); ++stream_index) {
@@ skipping 406 matching lines @@
   while (range_list) {
     range_info += base::IntToString(range_list->offset);
     range_info.push_back('-');
     range_info +=
         base::IntToString(range_list->offset + range_list->length - 1);
     range_list = range_list->next;
     if (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;
     }
   }
 
   // The lifetime of a NPStream instance depends on the PluginStream instance
   // which owns it. When a plugin invokes NPN_RequestRead on a seekable stream,
   // we don't want to create a new stream when the corresponding response is
   // received. We send over a cookie which represents the PluginStream
   // instance which is sent back from the renderer when the response is
   // received.
   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.
       plugin_stream->set_seekable(true);
 
       pending_range_requests_[++next_range_request_id_] = plugin_stream;
       webplugin_->InitiateHTTPRangeRequest(
           stream->url, range_info.c_str(), next_range_request_id_);
       return;
     }
@@ skipping 100 matching lines @@
     *notify = false;
     *notify_data = NULL;
   }
 }
 
 void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) {
   // The notify_data passed in allows us to identify the matching stream.
   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();
       webplugin_->URLRedirectResponse(allow, resource_client->ResourceId());
       if (allow) {
         plugin_stream->UpdateUrl(
             plugin_stream->pending_redirect_url().c_str());
       }
       break;
     }
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit