Merge 143201 - Fix a crash in Pepper object scripting.

ppapi/proxy/ppb_var_deprecated_proxy.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/ppb_var_deprecated_proxy.h"
 
 #include <stdlib.h>  // For malloc
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 251 matching lines @@
   ReceiveSerializedVarReturnValue result;
   int64 class_int = static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class));
   int64 data_int =
       static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class_data));
   dispatcher->Send(new PpapiHostMsg_PPBVar_CreateObjectDeprecated(
       API_ID_PPB_VAR_DEPRECATED, instance, class_int, data_int,
       &result));
   PP_Var ret_var = result.Return(dispatcher);
 
   // Register this object as being implemented by the plugin.
-  tracker->PluginImplementedObjectCreated(instance, ret_var,
-                                          ppp_class, ppp_class_data);
+  if (ret_var.type == PP_VARTYPE_OBJECT) {
+    tracker->PluginImplementedObjectCreated(instance, ret_var,
+                                            ppp_class, ppp_class_data);
+  }
   return ret_var;
 }
 
 InterfaceProxy* CreateVarDeprecatedProxy(Dispatcher* dispatcher) {
   return new PPB_Var_Deprecated_Proxy(dispatcher );
 }
 
 }  // namespace
 
 PPB_Var_Deprecated_Proxy::PPB_Var_Deprecated_Proxy(
@@ skipping 239 matching lines @@
 }
 
 void PPB_Var_Deprecated_Proxy::DoReleaseObject(int64 object_id) {
   PP_Var var = { PP_VARTYPE_OBJECT };
   var.value.as_id = object_id;
   ppb_var_impl_->Release(var);
 }
 
 }  // namespace proxy
 }  // namespace ppapi