Don't use a scoped_refptr for StringVar::FromPPVar

This was leftover from a previous design where I thought it would be
necessary. It turns out it just made the code ugly and did unnecessary
refcounting.

Review URL: http://codereview.chromium.org/7621054

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

10 files changed, 26 insertions, 26 deletions

diff --git a/ppapi/proxy/plugin_var_serialization_rules.cc b/ppapi/proxy/plugin_var_serialization_rules.cc
index f514773..49e1fc3 100644
--- a/ppapi/proxy/plugin_var_serialization_rules.cc
+++ b/ppapi/proxy/plugin_var_serialization_rules.cc
@@ -28,8 +28,8 @@ PP_Var PluginVarSerializationRules::SendCallerOwned(const PP_Var& var,
 
   // Retrieve the string to use for IPC.
   if (var.type == PP_VARTYPE_STRING) {
-    scoped_refptr<StringVar> string_var(StringVar::FromPPVar(var));
-    if (string_var.get())
+    StringVar* string_var = StringVar::FromPPVar(var);
+    if (string_var)
       *str_val = string_var->value();
     else
       NOTREACHED() << "Trying to send unknown string over IPC.";
@@ -116,8 +116,8 @@ PP_Var PluginVarSerializationRules::BeginSendPassRef(const PP_Var& var,
     return var_tracker_->GetHostObject(var);
 
   if (var.type == PP_VARTYPE_STRING) {
-    scoped_refptr<StringVar> string_var(StringVar::FromPPVar(var));
-    if (string_var.get())
+    StringVar* string_var = StringVar::FromPPVar(var);
+    if (string_var)
       *str_val = string_var->value();
     else
       NOTREACHED() << "Trying to send unknown string over IPC.";
diff --git a/ppapi/proxy/ppb_font_proxy.cc b/ppapi/proxy/ppb_font_proxy.cc
index 987c918..3c42ecd 100644
--- a/ppapi/proxy/ppb_font_proxy.cc
+++ b/ppapi/proxy/ppb_font_proxy.cc
@@ -30,7 +30,7 @@ namespace {
 
 bool PPTextRunToTextRun(const PP_TextRun_Dev* run,
                         WebKitForwarding::Font::TextRun* output) {
-  scoped_refptr<StringVar> str(StringVar::FromPPVar(run->text));
+  StringVar* str = StringVar::FromPPVar(run->text);
   if (!str)
     return false;
 
@@ -97,7 +97,7 @@ Font::Font(const HostResource& resource,
     : Resource(resource),
       webkit_event_(false, false) {
   TRACE_EVENT0("ppapi proxy", "Font::Font");
-  scoped_refptr<StringVar> face(StringVar::FromPPVar(desc.face));
+  StringVar* face = StringVar::FromPPVar(desc.face);
 
   PluginDispatcher* dispatcher = PluginDispatcher::GetForResource(this);
   WebKitForwarding* forwarding = dispatcher->GetWebKitForwarding();
@@ -106,7 +106,7 @@ Font::Font(const HostResource& resource,
                     base::Bind(&WebKitForwarding::CreateFontForwarding,
                                base::Unretained(forwarding),
                                &webkit_event_, desc,
-                               face.get() ? face->value() : std::string(),
+                               face ? face->value() : std::string(),
                                dispatcher->preferences(),
                                &font_forwarding_));
 }
diff --git a/ppapi/proxy/ppb_url_util_proxy.cc b/ppapi/proxy/ppb_url_util_proxy.cc
index 7490a10..a202038 100644
--- a/ppapi/proxy/ppb_url_util_proxy.cc
+++ b/ppapi/proxy/ppb_url_util_proxy.cc
@@ -36,7 +36,7 @@ PP_Var ConvertComponentsAndReturnURL(PP_Var url,
   if (!components)
     return url;  // Common case - plugin doesn't care about parsing.
 
-  scoped_refptr<StringVar> url_string(StringVar::FromPPVar(url));
+  StringVar* url_string = StringVar::FromPPVar(url);
   if (!url_string)
     return url;
 
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc
index ff32df1..396e50e 100644
--- a/ppapi/proxy/ppb_var_deprecated_proxy.cc
+++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc
@@ -70,7 +70,7 @@ PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
 }
 
 const char* VarToUtf8(PP_Var var, uint32_t* len) {
-  scoped_refptr<StringVar> str(StringVar::FromPPVar(var));
+  StringVar* str = StringVar::FromPPVar(var);
   if (str) {
     *len = static_cast<uint32_t>(str->value().size());
     return str->value().c_str();
diff --git a/ppapi/proxy/ppb_var_proxy.cc b/ppapi/proxy/ppb_var_proxy.cc
index 645e554..765deef 100644
--- a/ppapi/proxy/ppb_var_proxy.cc
+++ b/ppapi/proxy/ppb_var_proxy.cc
@@ -30,7 +30,7 @@ PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
 }
 
 const char* VarToUtf8(PP_Var var, uint32_t* len) {
-  scoped_refptr<StringVar> str(StringVar::FromPPVar(var));
+  StringVar* str = StringVar::FromPPVar(var);
   if (str) {
     *len = static_cast<uint32_t>(str->value().size());
     return str->value().c_str();
diff --git a/ppapi/proxy/ppp_messaging_proxy_test.cc b/ppapi/proxy/ppp_messaging_proxy_test.cc
index 839a7ef..25c7e55 100644
--- a/ppapi/proxy/ppp_messaging_proxy_test.cc
+++ b/ppapi/proxy/ppp_messaging_proxy_test.cc
@@ -128,13 +128,13 @@ TEST_F(PPP_Messaging_ProxyTest, SendMessages) {
   EXPECT_EQ(expected_instance, received_instance);
   EXPECT_EQ(expected_var.type, received_var.type);
 
-  scoped_refptr<StringVar> received_string(StringVar::FromPPVar(received_var));
-  ASSERT_TRUE(received_string.get());
+  StringVar* received_string = StringVar::FromPPVar(received_var);
+  ASSERT_TRUE(received_string);
   EXPECT_EQ(kTestString, received_string->value());
   // Now release the var, and the string should go away (because the ref
   // count should be one).
   plugin().var_tracker().ReleaseVar(received_var);
-  EXPECT_FALSE(StringVar::FromPPVar(received_var).get());
+  EXPECT_FALSE(StringVar::FromPPVar(received_var));
 }
 
 }  // namespace proxy
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index bc9d0e8..c6d02a7e 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -211,7 +211,7 @@ PP_Resource ResourceCreationProxy::CreateKeyboardInputEvent(
   data.event_modifiers = modifiers;
   data.key_code = key_code;
   if (character_text.type == PP_VARTYPE_STRING) {
-    scoped_refptr<StringVar> text_str(StringVar::FromPPVar(character_text));
+    StringVar* text_str = StringVar::FromPPVar(character_text);
     if (!text_str)
       return 0;
     data.character_text = text_str->value();
diff --git a/ppapi/shared_impl/url_util_impl.cc b/ppapi/shared_impl/url_util_impl.cc
index 66a6185..ddad401 100644
--- a/ppapi/shared_impl/url_util_impl.cc
+++ b/ppapi/shared_impl/url_util_impl.cc
@@ -44,7 +44,7 @@ void ConvertComponents(const url_parse::Parsed& input,
 PP_Var URLUtilImpl::Canonicalize(PP_Module pp_module,
                                  PP_Var url,
                                  PP_URLComponents_Dev* components) {
-  scoped_refptr<StringVar> url_string(StringVar::FromPPVar(url));
+  StringVar* url_string = StringVar::FromPPVar(url);
   if (!url_string)
     return PP_MakeNull();
   return GenerateURLReturn(pp_module, GURL(url_string->value()), components);
@@ -55,8 +55,8 @@ PP_Var URLUtilImpl::ResolveRelativeToURL(PP_Module pp_module,
                                          PP_Var base_url,
                                          PP_Var relative,
                                          PP_URLComponents_Dev* components) {
-  scoped_refptr<StringVar> base_url_string(StringVar::FromPPVar(base_url));
-  scoped_refptr<StringVar> relative_string(StringVar::FromPPVar(relative));
+  StringVar* base_url_string = StringVar::FromPPVar(base_url);
+  StringVar* relative_string = StringVar::FromPPVar(relative);
   if (!base_url_string || !relative_string)
     return PP_MakeNull();
 
@@ -70,8 +70,8 @@ PP_Var URLUtilImpl::ResolveRelativeToURL(PP_Module pp_module,
 
 // static
 PP_Bool URLUtilImpl::IsSameSecurityOrigin(PP_Var url_a, PP_Var url_b) {
-  scoped_refptr<StringVar> url_a_string(StringVar::FromPPVar(url_a));
-  scoped_refptr<StringVar> url_b_string(StringVar::FromPPVar(url_b));
+  StringVar* url_a_string = StringVar::FromPPVar(url_a);
+  StringVar* url_b_string = StringVar::FromPPVar(url_b);
   if (!url_a_string || !url_b_string)
     return PP_FALSE;
 
diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc
index af63b0b..0542e50 100644
--- a/ppapi/shared_impl/var.cc
+++ b/ppapi/shared_impl/var.cc
@@ -37,7 +37,7 @@ std::string Var::PPVarToLogString(PP_Var var) {
     case PP_VARTYPE_DOUBLE:
       return base::DoubleToString(var.value.as_double);
     case PP_VARTYPE_STRING: {
-      scoped_refptr<StringVar> string(StringVar::FromPPVar(var));
+      StringVar* string(StringVar::FromPPVar(var));
       if (!string)
         return "[Invalid string]";
 
@@ -139,14 +139,14 @@ PP_Var StringVar::StringToPPVar(PP_Module module,
 }
 
 // static
-scoped_refptr<StringVar> StringVar::FromPPVar(PP_Var var) {
+StringVar* StringVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_STRING)
-    return scoped_refptr<StringVar>();
+    return NULL;
   scoped_refptr<Var> var_object(
       TrackerBase::Get()->GetVarTracker()->GetVar(var));
   if (!var_object)
-    return scoped_refptr<StringVar>();
-  return scoped_refptr<StringVar>(var_object->AsStringVar());
+    return NULL;
+  return var_object->AsStringVar();
 }
 
 }  // namespace ppapi
diff --git a/ppapi/shared_impl/var.h b/ppapi/shared_impl/var.h
index 1ff42dd..02553bb 100644
--- a/ppapi/shared_impl/var.h
+++ b/ppapi/shared_impl/var.h
@@ -84,7 +84,7 @@ class Var : public base::RefCounted<Var> {
 //   return StringVar::StringToPPVar(module, my_string);
 //
 // Converting a PP_Var to a string:
-//   scoped_refptr<StringVar> string(StringVar::FromPPVar(var));
+//   StringVar* string = StringVar::FromPPVar(var);
 //   if (!string)
 //     return false;  // Not a string or an invalid var.
 //   DoSomethingWithTheString(string->value());
@@ -112,7 +112,7 @@ class StringVar : public Var {
 
   // Helper function that converts a PP_Var to a string. This will return NULL
   // if the PP_Var is not of string type or the string is invalid.
-  static scoped_refptr<StringVar> FromPPVar(PP_Var var);
+  static StringVar* FromPPVar(PP_Var var);
 
  private:
   std::string value_;