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

webkit/plugins/npapi/plugin_host.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_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 72 matching lines @@
 PluginHost::~PluginHost() {
 }
 
 PluginHost *PluginHost::Singleton() {
   CR_DEFINE_STATIC_LOCAL(scoped_refptr<PluginHost>, singleton, ());
   if (singleton.get() == NULL) {
     singleton = new PluginHost();
   }
 
   DCHECK(singleton.get() != NULL);
-  return singleton;
+  return singleton.get();
 }
 
 void PluginHost::InitializeHostFuncs() {
   memset(&host_funcs_, 0, sizeof(host_funcs_));
   host_funcs_.size = sizeof(host_funcs_);
   host_funcs_.version = (NP_VERSION_MAJOR << 8) | (NP_VERSION_MINOR);
 
   // The "basic" functions
   host_funcs_.geturl = &NPN_GetURL;
   host_funcs_.posturl = &NPN_PostURL;
@@ skipping 233 matching lines @@
   WebKit::resetPluginCache(reload_pages ? true : false);
 }
 
 // Requests a range of bytes for a seekable stream.
 NPError NPN_RequestRead(NPStream* stream, NPByteRange* range_list) {
   if (!stream || !range_list)
     return NPERR_GENERIC_ERROR;
 
   scoped_refptr<PluginInstance> plugin(
       reinterpret_cast<PluginInstance*>(stream->ndata));
-  if (!plugin)
+  if (!plugin.get())
     return NPERR_GENERIC_ERROR;
 
   plugin->RequestRead(stream, range_list);
   return NPERR_NO_ERROR;
 }
 
 // Generic form of GetURL for common code between GetURL and GetURLNotify.
 static NPError GetURLNotify(NPP id,
                             const char* url,
                             const char* target,
                             bool notify,
                             void* notify_data) {
   if (!url)
     return NPERR_INVALID_URL;
 
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (!plugin) {
+  if (!plugin.get()) {
     return NPERR_GENERIC_ERROR;
   }
 
   plugin->RequestURL(url, "GET", target, NULL, 0, notify, notify_data);
   return NPERR_NO_ERROR;
 }
 
 // Requests creation of a new stream with the contents of the
 // specified URL; gets notification of the result.
 NPError NPN_GetURLNotify(NPP id,
@@ skipping 43 matching lines @@
                              const char* target,
                              uint32_t len,
                              const char* buf,
                              NPBool file,
                              bool notify,
                              void* notify_data) {
   if (!url)
     return NPERR_INVALID_URL;
 
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (!plugin) {
+  if (!plugin.get()) {
     NOTREACHED();
     return NPERR_GENERIC_ERROR;
   }
 
   std::string post_file_contents;
 
   if (file) {
     // Post data to be uploaded from a file. This can be handled in two
     // ways.
     // 1. Read entire file and send the contents as if it was a post data
@@ skipping 237 matching lines @@
   //              plug-in drawing occurs, returns HWND
   //    NPNVjavascriptEnabledBool:  tells whether Javascript is enabled
   //    NPNVasdEnabledBool:  tells whether SmartUpdate is enabled
   //    NPNVOfflineBool: tells whether offline-mode is enabled
 
   NPError rv = NPERR_GENERIC_ERROR;
 
   switch (static_cast<int>(variable)) {
     case NPNVWindowNPObject: {
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin) {
+      if (!plugin.get()) {
         NOTREACHED();
         return NPERR_INVALID_INSTANCE_ERROR;
       }
       NPObject *np_object = plugin->webplugin()->GetWindowScriptNPObject();
       // Return value is expected to be retained, as
       // described here:
       // <http://www.mozilla.org/projects/plugins/npruntime.html#browseraccess>
       if (np_object) {
         WebBindings::retainObject(np_object);
         void **v = (void **)value;
         *v = np_object;
         rv = NPERR_NO_ERROR;
       } else {
         NOTREACHED();
       }
       break;
     }
     case NPNVPluginElementNPObject: {
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin) {
+      if (!plugin.get()) {
         NOTREACHED();
         return NPERR_INVALID_INSTANCE_ERROR;
       }
       NPObject *np_object = plugin->webplugin()->GetPluginElement();
       // Return value is expected to be retained, as
       // described here:
       // <http://www.mozilla.org/projects/plugins/npruntime.html#browseraccess>
       if (np_object) {
         WebBindings::retainObject(np_object);
         void** v = static_cast<void**>(value);
         *v = np_object;
         rv = NPERR_NO_ERROR;
       } else {
         NOTREACHED();
       }
       break;
     }
   #if !defined(OS_MACOSX)  // OS X doesn't have windowed plugins.
     case NPNVnetscapeWindow: {
       scoped_refptr<PluginInstance> plugin = FindInstance(id);
-      if (!plugin) {
+      if (!plugin.get()) {
         NOTREACHED();
         return NPERR_INVALID_INSTANCE_ERROR;
       }
       gfx::PluginWindowHandle handle = plugin->window_handle();
       *((void**)value) = (void*)handle;
       rv = NPERR_NO_ERROR;
       break;
     }
   #endif
     case NPNVjavascriptEnabledBool: {
@@ skipping 16 matching lines @@
   #endif
     case NPNVSupportsWindowless: {
       NPBool* supports_windowless = reinterpret_cast<NPBool*>(value);
       *supports_windowless = true;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVprivateModeBool: {
       NPBool* private_mode = reinterpret_cast<NPBool*>(value);
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin) {
+      if (!plugin.get()) {
         NOTREACHED();
         return NPERR_INVALID_INSTANCE_ERROR;
       }
       *private_mode = plugin->webplugin()->IsOffTheRecord();
       rv = NPERR_NO_ERROR;
       break;
     }
   #if defined(OS_MACOSX)
     case NPNVpluginDrawingModel: {
       // return the drawing model that was negotiated when we initialized.
@@ skipping 54 matching lines @@
       DVLOG(1) << "NPN_GetValue(" << variable << ") is not implemented yet.";
       break;
   }
   return rv;
 }
 
 NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) {
   // Allows the plugin to set various modes
 
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (!plugin) {
+  if (!plugin.get()) {
     NOTREACHED();
     return NPERR_INVALID_INSTANCE_ERROR;
   }
   switch(variable) {
     case NPPVpluginWindowBool: {
       // Sets windowless mode for display of the plugin
       // Note: the documentation at
       // http://developer.mozilla.org/en/docs/NPN_SetValue is wrong.  When
       // value is NULL, the mode is set to true.  This is the same way Mozilla
       // works.
@@ skipping 63 matching lines @@
 }
 
 void* NPN_GetJavaPeer(NPP) {
   // TODO: implement me
   DVLOG(1) << "NPN_GetJavaPeer is not implemented.";
   return NULL;
 }
 
 void NPN_PushPopupsEnabledState(NPP id, NPBool enabled) {
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (plugin)
+  if (plugin.get())
     plugin->PushPopupsEnabledState(enabled ? true : false);
 }
 
 void NPN_PopPopupsEnabledState(NPP id) {
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (plugin)
+  if (plugin.get())
     plugin->PopPopupsEnabledState();
 }
 
 void NPN_PluginThreadAsyncCall(NPP id,
                                void (*func)(void*),
                                void* user_data) {
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (plugin)
+  if (plugin.get())
     plugin->PluginThreadAsyncCall(func, user_data);
 }
 
 NPError NPN_GetValueForURL(NPP id,
                            NPNURLVariable variable,
                            const char* url,
                            char** value,
                            uint32_t* len) {
   if (!id)
     return NPERR_INVALID_PARAM;
 
   if (!url || !*url || !len)
     return NPERR_INVALID_URL;
 
   *len = 0;
   std::string result;
 
   switch (variable) {
     case NPNURLVProxy: {
       result = "DIRECT";
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin)
+      if (!plugin.get())
         return NPERR_GENERIC_ERROR;
 
       WebPlugin* webplugin = plugin->webplugin();
       if (!webplugin)
         return NPERR_GENERIC_ERROR;
 
       if (!webplugin->FindProxyForUrl(GURL(std::string(url)), &result))
         return NPERR_GENERIC_ERROR;
       break;
     }
     case NPNURLVCookie: {
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin)
+      if (!plugin.get())
         return NPERR_GENERIC_ERROR;
 
       WebPlugin* webplugin = plugin->webplugin();
       if (!webplugin)
         return NPERR_GENERIC_ERROR;
 
       // Bypass third-party cookie blocking by using the url as the
       // first_party_for_cookies.
       GURL cookies_url((std::string(url)));
       result = webplugin->GetCookies(cookies_url, cookies_url);
@@ skipping 19 matching lines @@
                            uint32_t len) {
   if (!id)
     return NPERR_INVALID_PARAM;
 
   if (!url || !*url)
     return NPERR_INVALID_URL;
 
   switch (variable) {
     case NPNURLVCookie: {
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin)
+      if (!plugin.get())
         return NPERR_GENERIC_ERROR;
 
       WebPlugin* webplugin = plugin->webplugin();
       if (!webplugin)
         return NPERR_GENERIC_ERROR;
 
       std::string cookie(value, len);
       GURL cookies_url((std::string(url)));
       webplugin->SetCookie(cookies_url, cookies_url, cookie);
       return NPERR_NO_ERROR;
@@ skipping 25 matching lines @@
 
   // TODO: implement me (bug 23928)
   return NPERR_GENERIC_ERROR;
 }
 
 uint32_t NPN_ScheduleTimer(NPP id,
                            uint32_t interval,
                            NPBool repeat,
                            void (*func)(NPP id, uint32_t timer_id)) {
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (!plugin)
+  if (!plugin.get())
     return 0;
 
   return plugin->ScheduleTimer(interval, repeat, func);
 }
 
 void NPN_UnscheduleTimer(NPP id, uint32_t timer_id) {
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (plugin)
+  if (plugin.get())
     plugin->UnscheduleTimer(timer_id);
 }
 
 NPError NPN_PopUpContextMenu(NPP id, NPMenu* menu) {
   if (!menu)
     return NPERR_INVALID_PARAM;
 
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (plugin) {
+  if (plugin.get()) {
     return plugin->PopUpContextMenu(menu);
   }
   NOTREACHED();
   return NPERR_GENERIC_ERROR;
 }
 
 NPBool NPN_ConvertPoint(NPP id, double sourceX, double sourceY,
                         NPCoordinateSpace sourceSpace,
                         double *destX, double *destY,
                         NPCoordinateSpace destSpace) {
   scoped_refptr<PluginInstance> plugin(FindInstance(id));
-  if (plugin) {
-    return plugin->ConvertPoint(sourceX, sourceY, sourceSpace,
-                                destX, destY, destSpace);
+  if (plugin.get()) {
+    return plugin->ConvertPoint(
+        sourceX, sourceY, sourceSpace, destX, destY, destSpace);
   }
   NOTREACHED();
   return false;
 }
 
 NPBool NPN_HandleEvent(NPP id, void *event, NPBool handled) {
   // TODO: Implement advanced key handling: http://crbug.com/46578
   NOTIMPLEMENTED();
   return false;
 }
 
 NPBool NPN_UnfocusInstance(NPP id, NPFocusDirection direction) {
   // TODO: Implement advanced key handling: http://crbug.com/46578
   NOTIMPLEMENTED();
   return false;
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
   scoped_refptr<PluginInstance> plugin(FindInstance(instance));
-  if (plugin) {
+  if (plugin.get()) {
     plugin->URLRedirectResponse(!!allow, notify_data);
   }
 }
 
 }  // extern "C"