Revert 180093

ppapi/shared_impl/var_tracker.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/shared_impl/var_tracker.h"
 
 #include <string.h>
 
 #include <limits>
 
@@ skipping 168 matching lines @@
   DCHECK(CalledOnValidThread());
 
   scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
   if (!array_buffer)
     return PP_MakeNull();
   return array_buffer->GetPPVar();
 }
 
 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
                                         const void* data) {
-  ArrayBufferVar* array_buffer = MakeArrayBufferVar(size_in_bytes, data);
-  return array_buffer ? array_buffer->GetPPVar() : PP_MakeNull();
-}
+  DCHECK(CalledOnValidThread());
 
-ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes,
-                                               const void* data) {
-  DCHECK(CalledOnValidThread());
-  ArrayBufferVar* array_buffer(CreateArrayBuffer(size_in_bytes));
+  scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
   if (!array_buffer)
-    return NULL;
+    return PP_MakeNull();
   memcpy(array_buffer->Map(), data, size_in_bytes);
-  return array_buffer;
+  return array_buffer->GetPPVar();
 }
 
 std::vector<PP_Var> VarTracker::GetLiveVars() {
   DCHECK(CalledOnValidThread());
 
   std::vector<PP_Var> var_vector;
   var_vector.reserve(live_vars_.size());
   for (VarMap::const_iterator iter = live_vars_.begin();
        iter != live_vars_.end();
        ++iter) {
@@ skipping 14 matching lines @@
 bool VarTracker::DeleteObjectInfoIfNecessary(VarMap::iterator iter) {
   if (iter->second.ref_count != 0 ||
       iter->second.track_with_no_reference_count != 0)
     return false;  // Object still alive.
   iter->second.var->ResetVarID();
   live_vars_.erase(iter);
   return true;
 }
 
 }  // namespace ppapi