Merge 145987 - Do not specify SHCNF_FLUSHNOWAIT on SHChangeNotify after updating shortcuts.

base/file_util_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.
 
 #include "base/file_util.h"
 
 #include <windows.h>
 #include <propvarutil.h>
 #include <psapi.h>
 #include <shellapi.h>
@@ skipping 420 matching lines @@
 
   HRESULT result = i_persist_file->Save(destination, TRUE);
 
   // If we successfully updated the icon, notify the shell that we have done so.
   if (!create && SUCCEEDED(result)) {
     // 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();
 
-    SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST | SHCNF_FLUSHNOWAIT,
-                   NULL, NULL);
+    SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
   }
 
   return SUCCEEDED(result);
 }
 
 bool TaskbarPinShortcutLink(const wchar_t* shortcut) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   // "Pin to taskbar" is only supported after Win7.
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
@@ skipping 655 matching lines @@
   HANDLE cp = GetCurrentProcess();
   if (::GetMappedFileNameW(cp, file_view, mapped_file_path, kMaxPathLength)) {
     *nt_path = FilePath(mapped_file_path);
     success = true;
   }
   ::UnmapViewOfFile(file_view);
   return success;
 }
 
 }  // namespace file_util