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

Linux fixes

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/15806016

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

15 files changed, 35 insertions, 40 deletions

diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc
index 07d343094..3da1070 100644
--- a/ppapi/proxy/pdf_resource.cc
+++ b/ppapi/proxy/pdf_resource.cc
@@ -124,7 +124,7 @@ void PDFResource::HistogramPDFPageCount(int count) {
 void PDFResource::UserMetricsRecordAction(const PP_Var& action) {
   scoped_refptr<ppapi::StringVar> action_str(
       ppapi::StringVar::FromPPVar(action));
-  if (action_str) {
+  if (action_str.get()) {
     Post(RENDERER,
          PpapiHostMsg_PDF_UserMetricsRecordAction(action_str->value()));
   }
diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc
index d479ec7..58e3680 100644
--- a/ppapi/proxy/plugin_dispatcher.cc
+++ b/ppapi/proxy/plugin_dispatcher.cc
@@ -59,7 +59,7 @@ InstanceData::InstanceData()
 
 InstanceData::~InstanceData() {
   // Run any pending mouse lock callback to prevent leaks.
-  if (mouse_lock_callback)
+  if (mouse_lock_callback.get())
     mouse_lock_callback->Abort();
 }
 
diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc
index 3083832..fba5b1f 100644
--- a/ppapi/proxy/plugin_globals.cc
+++ b/ppapi/proxy/plugin_globals.cc
@@ -76,7 +76,7 @@ PluginGlobals::~PluginGlobals() {
     // count, so this will delete the MessageLoop resource. We do this before
     // we clear plugin_globals_, because the Resource destructor tries to access
     // this PluginGlobals.
-    DCHECK(!loop_for_main_thread_ || loop_for_main_thread_->HasOneRef());
+    DCHECK(!loop_for_main_thread_.get() || loop_for_main_thread_->HasOneRef());
     loop_for_main_thread_ = NULL;
   }
   plugin_globals_ = NULL;
diff --git a/ppapi/proxy/plugin_var_tracker.cc b/ppapi/proxy/plugin_var_tracker.cc
index 585454b..ee29985 100644
--- a/ppapi/proxy/plugin_var_tracker.cc
+++ b/ppapi/proxy/plugin_var_tracker.cc
@@ -57,7 +57,7 @@ PP_Var PluginVarTracker::ReceiveObjectPassRef(const PP_Var& host_var,
     // two references on our behalf. We want to transfer that extra reference
     // to our list. This means we addref in the plugin, and release the extra
     // one in the renderer.
-    SendReleaseObjectMsg(*object);
+    SendReleaseObjectMsg(*object.get());
   }
   info.ref_count++;
   return ret;
diff --git a/ppapi/proxy/plugin_var_tracker_unittest.cc b/ppapi/proxy/plugin_var_tracker_unittest.cc
index 83ce6be..f43d7a8 100644
--- a/ppapi/proxy/plugin_var_tracker_unittest.cc
+++ b/ppapi/proxy/plugin_var_tracker_unittest.cc
@@ -199,11 +199,9 @@ TEST_F(PluginVarTrackerTest, PluginObjectInstanceDeleted) {
   // Make a var with one reference.
   scoped_refptr<ProxyObjectVar> object(
       new ProxyObjectVar(plugin_dispatcher(), host_object.value.as_id));
-  PP_Var plugin_var = MakeObject(var_tracker().AddVar(object));
-  var_tracker().PluginImplementedObjectCreated(pp_instance,
-                                               plugin_var,
-                                               &mark_on_deallocate_class,
-                                               user_data);
+  PP_Var plugin_var = MakeObject(var_tracker().AddVar(object.get()));
+  var_tracker().PluginImplementedObjectCreated(
+      pp_instance, plugin_var, &mark_on_deallocate_class, user_data);
 
   // Release the plugin ref to the var. WebKit hasn't called destroy so
   // we won't get a destroy call.
@@ -230,11 +228,9 @@ TEST_F(PluginVarTrackerTest, PluginObjectLeaked) {
   // Make a var with one reference.
   scoped_refptr<ProxyObjectVar> object(
       new ProxyObjectVar(plugin_dispatcher(), host_object.value.as_id));
-  PP_Var plugin_var = MakeObject(var_tracker().AddVar(object));
-  var_tracker().PluginImplementedObjectCreated(pp_instance,
-                                               plugin_var,
-                                               &mark_on_deallocate_class,
-                                               user_data);
+  PP_Var plugin_var = MakeObject(var_tracker().AddVar(object.get()));
+  var_tracker().PluginImplementedObjectCreated(
+      pp_instance, plugin_var, &mark_on_deallocate_class, user_data);
 
   // Destroy the instance. This should not call deallocate since the plugin
   // still has a ref.
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 528d8e7..4009a19 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -411,7 +411,7 @@ Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance,
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)
   }
 
-  if (!new_singleton) {
+  if (!new_singleton.get()) {
     // Getting here implies that a constructor is missing in the above switch.
     NOTREACHED();
     return NULL;
diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc
index fb01485..63d465a 100644
--- a/ppapi/proxy/ppb_message_loop_proxy.cc
+++ b/ppapi/proxy/ppb_message_loop_proxy.cc
@@ -177,10 +177,9 @@ void MessageLoopResource::PostClosure(
     const tracked_objects::Location& from_here,
     const base::Closure& closure,
     int64 delay_ms) {
-  if (loop_proxy_) {
-    loop_proxy_->PostDelayedTask(from_here,
-                                 closure,
-                                 base::TimeDelta::FromMilliseconds(delay_ms));
+  if (loop_proxy_.get()) {
+    loop_proxy_->PostDelayedTask(
+        from_here, closure, base::TimeDelta::FromMilliseconds(delay_ms));
   } else {
     TaskInfo info;
     info.from_here = FROM_HERE;
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index 363ac7a..95f748d 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -227,9 +227,9 @@ PP_Resource ResourceCreationProxy::CreateFileChooser(
     PP_FileChooserMode_Dev mode,
     const PP_Var& accept_types) {
   scoped_refptr<StringVar> string_var = StringVar::FromPPVar(accept_types);
-  std::string str = string_var ? string_var->value() : std::string();
-  return (new FileChooserResource(GetConnection(), instance, mode,
-                                  str.c_str()))->GetReference();
+  std::string str = string_var.get() ? string_var->value() : std::string();
+  return (new FileChooserResource(GetConnection(), instance, mode, str.c_str()))
+      ->GetReference();
 }
 
 PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance,
diff --git a/ppapi/proxy/serialized_var.cc b/ppapi/proxy/serialized_var.cc
index 2f4a396..1217a83 100644
--- a/ppapi/proxy/serialized_var.cc
+++ b/ppapi/proxy/serialized_var.cc
@@ -56,7 +56,7 @@ SerializedVar::Inner::~Inner() {
 }
 
 PP_Var SerializedVar::Inner::GetVar() {
-  DCHECK(serialization_rules_);
+  DCHECK(serialization_rules_.get());
 
 #if defined(NACL_WIN64)
   NOTREACHED();
@@ -74,7 +74,7 @@ PP_Var SerializedVar::Inner::GetVar() {
 void SerializedVar::Inner::SetVar(PP_Var var) {
   // Sanity check, when updating the var we should have received a
   // serialization rules pointer already.
-  DCHECK(serialization_rules_);
+  DCHECK(serialization_rules_.get());
   var_ = var;
   raw_var_data_.reset(NULL);
 }
@@ -100,7 +100,7 @@ void SerializedVar::Inner::WriteToMessage(IPC::Message* m) const {
   // that returns a var. This means the message handler didn't write to the
   // output parameter, or possibly you used the wrong helper class
   // (normally SerializedVarReturnValue).
-  DCHECK(serialization_rules_);
+  DCHECK(serialization_rules_.get());
 
 #ifndef NDEBUG
   // We should only be serializing something once.
diff --git a/ppapi/proxy/serialized_var.h b/ppapi/proxy/serialized_var.h
index 7c3349f..98cafa0 100644
--- a/ppapi/proxy/serialized_var.h
+++ b/ppapi/proxy/serialized_var.h
@@ -104,7 +104,7 @@ class PPAPI_PROXY_EXPORT SerializedVar {
     ~Inner();
 
     VarSerializationRules* serialization_rules() {
-      return serialization_rules_;
+      return serialization_rules_.get();
     }
     void set_serialization_rules(VarSerializationRules* serialization_rules) {
       serialization_rules_ = serialization_rules;
diff --git a/ppapi/proxy/truetype_font_singleton_resource.cc b/ppapi/proxy/truetype_font_singleton_resource.cc
index 1fee97b..027557e 100644
--- a/ppapi/proxy/truetype_font_singleton_resource.cc
+++ b/ppapi/proxy/truetype_font_singleton_resource.cc
@@ -49,7 +49,7 @@ int32_t TrueTypeFontSingletonResource::GetFontsInFamily(
       const scoped_refptr<TrackedCallback>& callback) {
   scoped_refptr<StringVar> family_var = StringVar::FromPPVar(family);
   const uint32_t kMaxFamilySizeInBytes = 1024;
-  if (!family_var || family_var->value().size() > kMaxFamilySizeInBytes)
+  if (!family_var.get() || family_var->value().size() > kMaxFamilySizeInBytes)
     return PP_ERROR_BADARGUMENT;
   Call<PpapiPluginMsg_TrueTypeFontSingleton_GetFontsInFamilyReply>(BROWSER,
       PpapiHostMsg_TrueTypeFontSingleton_GetFontsInFamily(family_var->value()),
diff --git a/ppapi/proxy/url_loader_resource.cc b/ppapi/proxy/url_loader_resource.cc
index 5ee8d95..5bbc937 100644
--- a/ppapi/proxy/url_loader_resource.cc
+++ b/ppapi/proxy/url_loader_resource.cc
@@ -325,7 +325,7 @@ void URLLoaderResource::SetDefersLoading(bool defers_loading) {
 
 int32_t URLLoaderResource::ValidateCallback(
     scoped_refptr<TrackedCallback> callback) {
-  DCHECK(callback);
+  DCHECK(callback.get());
   if (TrackedCallback::IsPending(pending_callback_))
     return PP_ERROR_INPROGRESS;
   return PP_OK;
diff --git a/ppapi/proxy/video_destination_resource.cc b/ppapi/proxy/video_destination_resource.cc
index b08d063..5175705 100644
--- a/ppapi/proxy/video_destination_resource.cc
+++ b/ppapi/proxy/video_destination_resource.cc
@@ -47,7 +47,7 @@ int32_t VideoDestinationResource::Open(
 
   scoped_refptr<StringVar> stream_url_var = StringVar::FromPPVar(stream_url);
   const uint32_t kMaxStreamIdSizeInBytes = 16384;
-  if (!stream_url_var ||
+  if (!stream_url_var.get() ||
       stream_url_var->value().size() > kMaxStreamIdSizeInBytes)
     return PP_ERROR_BADARGUMENT;
   Call<PpapiPluginMsg_VideoDestination_OpenReply>(RENDERER,
diff --git a/ppapi/proxy/video_source_resource.cc b/ppapi/proxy/video_source_resource.cc
index 3bce63d..0c3b192 100644
--- a/ppapi/proxy/video_source_resource.cc
+++ b/ppapi/proxy/video_source_resource.cc
@@ -47,7 +47,7 @@ int32_t VideoSourceResource::Open(
 
   scoped_refptr<StringVar> stream_url_var = StringVar::FromPPVar(stream_url);
   const uint32_t kMaxStreamIdSizeInBytes = 16384;
-  if (!stream_url_var ||
+  if (!stream_url_var.get() ||
       stream_url_var->value().size() > kMaxStreamIdSizeInBytes)
     return PP_ERROR_BADARGUMENT;
   Call<PpapiPluginMsg_VideoSource_OpenReply>(RENDERER,
diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc
index 7439826..004e648 100644
--- a/ppapi/proxy/websocket_resource.cc
+++ b/ppapi/proxy/websocket_resource.cc
@@ -89,7 +89,7 @@ int32_t WebSocketResource::Connect(
 
   // Get the URL.
   url_ = StringVar::FromPPVar(url);
-  if (!url_)
+  if (!url_.get())
     return PP_ERROR_BADARGUMENT;
 
   // Get the protocols.
@@ -100,7 +100,7 @@ int32_t WebSocketResource::Connect(
     scoped_refptr<StringVar> protocol(StringVar::FromPPVar(protocols[i]));
 
     // Check invalid and empty entries.
-    if (!protocol || !protocol->value().length())
+    if (!protocol.get() || !protocol->value().length())
       return PP_ERROR_BADARGUMENT;
 
     // Check duplicated protocol entries.
@@ -157,7 +157,7 @@ int32_t WebSocketResource::Close(uint16_t code,
     if (reason.type != PP_VARTYPE_UNDEFINED) {
       // Validate |reason|.
       reason_string_var = StringVar::FromPPVar(reason);
-      if (!reason_string_var ||
+      if (!reason_string_var.get() ||
           reason_string_var->value().size() > kMaxReasonSizeInBytes)
         return PP_ERROR_BADARGUMENT;
       reason_string = reason_string_var->value();
@@ -246,12 +246,12 @@ int32_t WebSocketResource::SendMessage(const PP_Var& message) {
     uint64_t payload_size = 0;
     if (message.type == PP_VARTYPE_STRING) {
       scoped_refptr<StringVar> message_string = StringVar::FromPPVar(message);
-      if (message_string)
+      if (message_string.get())
         payload_size += message_string->value().length();
     } else if (message.type == PP_VARTYPE_ARRAY_BUFFER) {
       scoped_refptr<ArrayBufferVar> message_array_buffer =
           ArrayBufferVar::FromPPVar(message);
-      if (message_array_buffer)
+      if (message_array_buffer.get())
         payload_size += message_array_buffer->ByteLength();
     } else {
       // TODO(toyoshim): Support Blob.
@@ -268,14 +268,14 @@ int32_t WebSocketResource::SendMessage(const PP_Var& message) {
   if (message.type == PP_VARTYPE_STRING) {
     // Convert message to std::string, then send it.
     scoped_refptr<StringVar> message_string = StringVar::FromPPVar(message);
-    if (!message_string)
+    if (!message_string.get())
       return PP_ERROR_BADARGUMENT;
     Post(RENDERER, PpapiHostMsg_WebSocket_SendText(message_string->value()));
   } else if (message.type == PP_VARTYPE_ARRAY_BUFFER) {
     // Convert message to std::vector<uint8_t>, then send it.
     scoped_refptr<ArrayBufferVar> message_arraybuffer =
         ArrayBufferVar::FromPPVar(message);
-    if (!message_arraybuffer)
+    if (!message_arraybuffer.get())
       return PP_ERROR_BADARGUMENT;
     uint8_t* message_data = static_cast<uint8_t*>(message_arraybuffer->Map());
     uint32 message_length = message_arraybuffer->ByteLength();
@@ -298,7 +298,7 @@ uint16_t WebSocketResource::GetCloseCode() {
 }
 
 PP_Var WebSocketResource::GetCloseReason() {
-  if (!close_reason_)
+  if (!close_reason_.get())
     return empty_string_->GetPPVar();
   return close_reason_->GetPPVar();
 }
@@ -312,7 +312,7 @@ PP_Var WebSocketResource::GetExtensions() {
 }
 
 PP_Var WebSocketResource::GetProtocol() {
-  if (!protocol_)
+  if (!protocol_.get())
     return empty_string_->GetPPVar();
   return protocol_->GetPPVar();
 }
@@ -322,7 +322,7 @@ PP_WebSocketReadyState WebSocketResource::GetReadyState() {
 }
 
 PP_Var WebSocketResource::GetURL() {
-  if (!url_)
+  if (!url_.get())
     return empty_string_->GetPPVar();
   return url_->GetPPVar();
 }