Add clean-up code to SetAppIdForWindow()....

app/win_util.cc

 // Copyright (c) 2006-2009 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 "app/win_util.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <propvarutil.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/png_encoder.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/registry.h"
+#include "base/scoped_comptr_win.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "grit/app_strings.h"
 #include "net/base/mime_util.h"
 
 // Ensure that we pick up this link library.
 #pragma comment(lib, "dwmapi.lib")
 
 namespace win_util {
@@ skipping 826 matching lines @@
 
   if (!function) {
     base::UnloadNativeLibrary(shell32_library);
     return;
   }
 
   // Set the application's name.
   PROPVARIANT pv;
   InitPropVariantFromString(app_id.c_str(), &pv);
 
-  IPropertyStore* pps;
+  ScopedComPtr<IPropertyStore> pps;
   SHGPSFW SHGetPropertyStoreForWindow = static_cast<SHGPSFW>(function);
-  if (S_OK == SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(&pps)) &&
-      S_OK == pps->SetValue(PKEY_AppUserModel_ID, pv)) {
-    pps->Commit();
+  HRESULT result = SHGetPropertyStoreForWindow(
+      hwnd, __uuidof(*pps), reinterpret_cast<void**>(pps.Receive()));
+  if (S_OK == result) {
+    if (S_OK == pps->SetValue(PKEY_AppUserModel_ID, pv))
+      pps->Commit();
   }
 
   // Cleanup.
+  PropVariantClear(&pv);
   base::UnloadNativeLibrary(shell32_library);
 }
 
 }  // namespace win_util