Revert of Fix scoped_ptr free to use delete [] instead of delete.

sandbox/win/src/win_utils.cc

 // Copyright (c) 2011 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 "sandbox/win/src/win_utils.h"
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 225 matching lines @@
     return true;
   }
 
   return false;
 }
 
 bool GetPathFromHandle(HANDLE handle, base::string16* path) {
   NtQueryObjectFunction NtQueryObject = NULL;
   ResolveNTFunctionPtr("NtQueryObject", &NtQueryObject);
 
-  OBJECT_NAME_INFORMATION* name = NULL;
-  ULONG size = 0;
+  OBJECT_NAME_INFORMATION initial_buffer;
+  OBJECT_NAME_INFORMATION* name = &initial_buffer;
+  ULONG size = sizeof(initial_buffer);
   // Query the name information a first time to get the size of the name.
   NTSTATUS status = NtQueryObject(handle, ObjectNameInformation, name, size,
                                   &size);
 
-  if (!size)
-    return false;
+  scoped_ptr<OBJECT_NAME_INFORMATION> name_ptr;
+  if (size) {
+    name = reinterpret_cast<OBJECT_NAME_INFORMATION*>(new BYTE[size]);
+    name_ptr.reset(name);
 
-  scoped_ptr<BYTE[]> name_ptr(new BYTE[size]);
-  name = reinterpret_cast<OBJECT_NAME_INFORMATION*>(name_ptr.get());
-
-  // Query the name information a second time to get the name of the
-  // object referenced by the handle.
-  status = NtQueryObject(handle, ObjectNameInformation, name, size, &size);
+    // Query the name information a second time to get the name of the
+    // object referenced by the handle.
+    status = NtQueryObject(handle, ObjectNameInformation, name, size, &size);
+  }
 
   if (STATUS_SUCCESS != status)
     return false;
 
   path->assign(name->ObjectName.Buffer, name->ObjectName.Length /
                                         sizeof(name->ObjectName.Buffer[0]));
   return true;
 }
 
 bool GetNtPathFromWin32Path(const base::string16& path,
@@ skipping 42 matching lines @@
     ::InterlockedCompareExchangePointer(
         reinterpret_cast<PVOID volatile*>(&ntdll), ntdll_local, NULL);
 
   }
 
   CHECK_NT(ntdll);
   FARPROC* function_ptr = reinterpret_cast<FARPROC*>(ptr);
   *function_ptr = ::GetProcAddress(ntdll, name);
   CHECK_NT(*function_ptr);
 }