Clean up: Use scoped_ptr<Foo[]> instead of scoped_array<Foo> in PortableDeviceWatcherWin::Enumerate…

chrome/browser/system_monitor/portable_device_watcher_win.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.
 //
 // Any tasks that communicates with the portable device may take >100ms to
 // complete. Those tasks should be run on an blocking thread instead of the
 // UI thread.
 
 #include "chrome/browser/system_monitor/portable_device_watcher_win.h"
 
@@ skipping 390 matching lines @@
   base::win::ScopedComPtr<IPortableDeviceManager> portable_device_mgr;
   if (!GetPortableDeviceManager(&portable_device_mgr))
     return false;
 
   // Get the total number of devices found on the system.
   DWORD pnp_device_count = 0;
   HRESULT hr = portable_device_mgr->GetDevices(NULL, &pnp_device_count);
   if (FAILED(hr))
     return false;
 
-  scoped_array<char16*> pnp_device_ids(new char16*[pnp_device_count]);
-  ZeroMemory(pnp_device_ids.get(), pnp_device_count);
+  scoped_ptr<char16*[]> pnp_device_ids(new char16*[pnp_device_count]);
   hr = portable_device_mgr->GetDevices(pnp_device_ids.get(), &pnp_device_count);
   if (FAILED(hr))
     return false;
 
   for (DWORD index = 0; index < pnp_device_count; ++index) {
     PortableDeviceWatcherWin::DeviceDetails device_details;
     if (GetDeviceInfoOnBlockingThread(
         portable_device_mgr, pnp_device_ids[index], &device_details))
       devices->push_back(device_details);
   }
+  for (DWORD index = 0; index < pnp_device_count; ++index)
+    CoTaskMemFree(pnp_device_ids[index]);

[kmadhusu, 2013/01/03 00:25:52]

As per
http://msdn.microsoft.com/en-us/library/windows/desktop/dd388693(v=vs.85).aspx,
I am supposed to free the associated memory using CoTaskMemFree() function.

[Lei Zhang, 2013/01/03 21:15:26]

Why not just do this at the end of the loop right above?

[kmadhusu, 2013/01/03 21:36:21]

Done.

   return !devices->empty();
 }
 
 // Handles the device attach event message on a media task runner.
 // |pnp_device_id| specifies the attached plug and play device ID string. On
 // success, returns true and populates |device_details| with device information.
 // On failure, returns false.
 bool HandleDeviceAttachedEventOnBlockingThread(
     const string16& pnp_device_id,
     PortableDeviceWatcherWin::DeviceDetails* device_details) {
@@ skipping 169 matching lines @@
     MTPStorageMap::iterator storage_map_iter = storage_map_.find(storage_id);
     DCHECK(storage_map_iter != storage_map_.end());
     system_monitor->ProcessRemovableStorageDetached(
         storage_map_iter->second.device_id);
     storage_map_.erase(storage_map_iter);
   }
   device_map_.erase(device_iter);
 }
 
 }  // namespace chrome