Remove special handling for strings in var serialization.

ppapi/proxy/serialized_var_unittest.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 "ppapi/proxy/ppapi_proxy_test.h"
 
 #include "ppapi/proxy/serialized_var.h"
 
 namespace ppapi {
 namespace proxy {
@@ skipping 41 matching lines @@
       EXPECT_EQ(1, var_tracker().GetRefCountForObject(plugin_object));
       // We should have informed the host that a reference was taken.
       EXPECT_EQ(1u, sink().message_count());
       *out_param.OutParam(plugin_dispatcher()) = plugin_object;
     }
 
     // The object should have transformed the plugin object back to the host
     // object ID. Nothing in the var tracker should have changed yet, and no
     // messages should have been sent.
     SerializedVarTestReader reader(sv);
-    EXPECT_EQ(host_object.value.as_id, reader.GetIncompleteVar().value.as_id);
+    EXPECT_EQ(host_object.value.as_id, reader.GetVar().value.as_id);
     EXPECT_EQ(1, var_tracker().GetRefCountForObject(plugin_object));
     EXPECT_EQ(1u, sink().message_count());
   }
 
   // The out param should have done an "end receive caller owned" on the plugin
   // var serialization rules, which should have released the "track-with-no-
   // reference" count in the var tracker as well as the 1 reference we passed
   // back to the host, so the object should no longer be in the tracker. The
   // reference we added has been removed, so another message should be sent to
   // the host to tell it we're done with the object.
@@ skipping 25 matching lines @@
       var_tracker().AddRefVar(plugin_string);
       EXPECT_EQ(2, var_tracker().GetRefCountForObject(plugin_string));
       EXPECT_EQ(0u, sink().message_count());
       *out_param.OutParam(plugin_dispatcher()) = plugin_string;
     }
 
     // The SerializedVar should have set the string value internally. Nothing in
     // the var tracker should have changed yet, and no messages should have been
     // sent.
     SerializedVarTestReader reader(sv);
-    EXPECT_EQ(kTestString, *reader.GetTrackerStringPtr());
+    //EXPECT_EQ(kTestString, *reader.GetTrackerStringPtr());
     EXPECT_EQ(2, var_tracker().GetRefCountForObject(plugin_string));
     EXPECT_EQ(0u, sink().message_count());
   }
   // The reference the string had initially should be gone, and the reference we
   // passed to the host should also be gone, so the string should be removed.
   EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_string));
   EXPECT_EQ(0u, sink().message_count());
 }
 
 // Tests receiving an argument and passing it back to the browser as an output
@@ skipping 12 matching lines @@
       // The "OutParam" does its work in its destructor, it will write the
       // information to the SerializedVar we passed in the constructor.
       SerializedVarOutParam out_param(&sv);
       *out_param.OutParam(plugin_dispatcher()) = plugin_object;
     }
 
     // The object should have transformed the plugin object back to the host
     // object ID. Nothing in the var tracker should have changed yet, and no
     // messages should have been sent.
     SerializedVarTestReader reader(sv);
-    EXPECT_EQ(host_object.value.as_id, reader.GetIncompleteVar().value.as_id);
+    EXPECT_EQ(host_object.value.as_id, reader.GetVar().value.as_id);
     EXPECT_EQ(1, var_tracker().GetRefCountForObject(plugin_object));
     EXPECT_EQ(0u, sink().message_count());
   }
 
   // The out param should have done an "end send pass ref" on the plugin
   // var serialization rules, which should have in turn released the reference
   // in the var tracker. Since we only had one reference, this should have sent
   // a release to the browser.
   EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object));
   EXPECT_EQ(1u, sink().message_count());
@@ skipping 179 matching lines @@
   }
 
   // When the ReturnValue object goes out of scope, it should have sent a
   // release message to the browser.
   EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object));
   EXPECT_EQ(1u, sink().message_count());
 }
 
 }  // namespace proxy
 }  // namespace ppapi