Rename ScopedComPtr::Release() to ScopedComPtr::Reset()

base/win/shortcut.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 "base/win/shortcut.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 #include <propkey.h>
 
@@ skipping 11 matching lines @@
 
 // Initializes |i_shell_link| and |i_persist_file| (releasing them first if they
 // are already initialized).
 // If |shortcut| is not NULL, loads |shortcut| into |i_persist_file|.
 // If any of the above steps fail, both |i_shell_link| and |i_persist_file| will
 // be released.
 void InitializeShortcutInterfaces(
     const wchar_t* shortcut,
     ScopedComPtr<IShellLink>* i_shell_link,
     ScopedComPtr<IPersistFile>* i_persist_file) {
-  i_shell_link->Release();
-  i_persist_file->Release();
+  i_shell_link->Reset();
+  i_persist_file->Reset();
   if (FAILED(i_shell_link->CreateInstance(CLSID_ShellLink, NULL,
                                           CLSCTX_INPROC_SERVER)) ||
       FAILED(i_persist_file->QueryFrom(i_shell_link->get())) ||
       (shortcut && FAILED((*i_persist_file)->Load(shortcut, STGM_READWRITE)))) {
-    i_shell_link->Release();
-    i_persist_file->Release();
+    i_shell_link->Reset();
+    i_persist_file->Reset();
   }
 }
 
 }  // namespace
 
 ShortcutProperties::ShortcutProperties()
     : icon_index(-1), dual_mode(false), options(0U) {
 }
 
 ShortcutProperties::ShortcutProperties(const ShortcutProperties& other) =
@@ skipping 101 matching lines @@
     if (has_dual_mode &&
         !SetBooleanValueForPropertyStore(property_store.get(),
                                          PKEY_AppUserModel_IsDualMode,
                                          properties.dual_mode)) {
       return false;
     }
   }
 
   // Release the interfaces to the old shortcut to make sure it doesn't prevent
   // overwriting it if needed.
-  old_i_persist_file.Release();
-  old_i_shell_link.Release();
+  old_i_persist_file.Reset();
+  old_i_shell_link.Reset();
 
   HRESULT result = i_persist_file->Save(shortcut_path.value().c_str(), TRUE);
 
   // Release the interfaces in case the SHChangeNotify call below depends on
   // the operations above being fully completed.
-  i_persist_file.Release();
-  i_shell_link.Release();
+  i_persist_file.Reset();
+  i_shell_link.Reset();
 
   // If we successfully created/updated the icon, notify the shell that we have
   // done so.
   const bool succeeded = SUCCEEDED(result);
   if (succeeded) {
     if (shortcut_existed) {
       // TODO(gab): SHCNE_UPDATEITEM might be sufficient here; further testing
       // required.
       SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
     } else {
@@ skipping 160 matching lines @@
   if (GetVersion() < VERSION_WIN7)
     return false;
 
   intptr_t result = reinterpret_cast<intptr_t>(ShellExecute(
       NULL, L"taskbarunpin", shortcut.value().c_str(), NULL, NULL, 0));
   return result > 32;
 }
 
 }  // namespace win
 }  // namespace base