Eliminate implicit conversion from scoped_refptr<T> to T*

webkit/plugins/npapi/plugin_instance.h

 // Copyright (c) 2011 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.
 
 // TODO: Need to deal with NPAPI's NPSavedData.
 //       I haven't seen plugins use it yet.
 
 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <stack>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
+#include "webkit/plugins/npapi/plugin_lib.h"
 
 class MessageLoop;
 
 namespace webkit {
 namespace npapi {
 
 class PluginLib;
 class PluginHost;
 class PluginStream;
 class PluginStreamUrl;
@@ skipping 59 matching lines @@
 
   // Get/Set the WebPlugin associated with this instance
   WebPlugin* webplugin() { return webplugin_; }
   void set_web_plugin(WebPlugin* webplugin) {
     webplugin_ = webplugin;
   }
 
   // Get the mimeType for this plugin stream
   const std::string &mime_type() { return mime_type_; }
 
-  PluginLib* plugin_lib() { return plugin_; }
+  scoped_refptr<PluginLib> plugin_lib() { return plugin_; }
 
 #if defined(OS_MACOSX)
   // Get/Set the Mac NPAPI drawing and event models
   NPDrawingModel drawing_model() { return drawing_model_; }
   void set_drawing_model(NPDrawingModel value) { drawing_model_ = value; }
   NPEventModel event_model() { return event_model_; }
   void set_event_model(NPEventModel value) { event_model_ = value; }
   // Updates the instance's tracking of the location of the plugin location
   // relative to the upper left of the screen.
   void set_plugin_origin(const gfx::Point& origin) { plugin_origin_ = origin; }
@@ skipping 16 matching lines @@
 
   // For each instance, we track all streams.  When the
   // instance closes, all remaining streams are also
   // closed.  All streams associated with this instance
   // should call AddStream so that they can be cleaned
   // up when the instance shuts down.
   void AddStream(PluginStream* stream);
 
   // This is called when a stream is closed. We remove the stream from the
   // list, which releases the reference maintained to the stream.
-  void RemoveStream(PluginStream* stream);
+  void RemoveStream(scoped_refptr<PluginStream> stream);
 
   // Closes all open streams on this instance.
   void CloseStreams();
 
   // Returns the WebPluginResourceClient object for a stream that has become
   // seekable.
   WebPluginResourceClient* GetRangeRequest(int id);
 
   // Have the plugin create it's script object.
   NPObject* GetPluginScriptableObject();
@@ skipping 210 matching lines @@
  private:
   scoped_refptr<PluginInstance> instance_;
   DISALLOW_COPY_AND_ASSIGN(ScopedCurrentPluginEvent);
 };
 #endif
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_